From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 May 2011 19:12:53 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a0f20f5a324ac84fc515e0666575d5c705f2aec;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

4a0f20f5a324ac84fc515e0666575d5c705f2aec