From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 May 2011 22:39:52 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47583fa9b4113accd43efc8c205586cd956405a6;p=python

merge 3.2
---

47583fa9b4113accd43efc8c205586cd956405a6