From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 22:51:44 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b37db00c46b1254ec34176386bd4b01c2e9d8834;p=python

merge 3.2
---

b37db00c46b1254ec34176386bd4b01c2e9d8834