From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 15:01:35 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5094eee2760c821bea041667dd99e5ce5309aca3;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

5094eee2760c821bea041667dd99e5ce5309aca3