From: Georg Brandl <georg@python.org>
Date: Wed, 3 Aug 2011 06:29:12 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1753^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83fad3e2cedeffb63544bc9357236f7ae9541024;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

83fad3e2cedeffb63544bc9357236f7ae9541024