From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Aug 2011 05:33:29 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1703
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3672c4e21f4a886306070512354443f229c5cd0e;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

3672c4e21f4a886306070512354443f229c5cd0e