From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 3 Apr 2012 04:35:44 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b845decc22c8082b77e153d6c6b67de251bfb049;p=python

merge heads
---

b845decc22c8082b77e153d6c6b67de251bfb049