From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 Jul 2011 19:10:35 +0000 (-0500)
Subject: merge 3.2 (#11627)
X-Git-Tag: v3.3.0a1~1898
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e92cd0ce987d11acf2b93d43171f61c297e935ba;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#11627)
---

e92cd0ce987d11acf2b93d43171f61c297e935ba