From: Georg Brandl <georg@python.org>
Date: Sun, 1 Jul 2012 07:56:07 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0b2~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9d2fc390d7eee2bc8c19e029ea4958aa10a4922;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

c9d2fc390d7eee2bc8c19e029ea4958aa10a4922