From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Jun 2011 02:40:46 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2075
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=267ca6cb231501d3d89fa835adb799284835ee2a;p=python

merge 3.2
---

267ca6cb231501d3d89fa835adb799284835ee2a