From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 May 2011 21:44:10 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65f7db3f59a7c0004ea2845e52680e75d9759698;p=python

merge 3.2
---

65f7db3f59a7c0004ea2845e52680e75d9759698