From: Georg Brandl <georg@python.org>
Date: Mon, 4 Jul 2011 17:58:12 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1956
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1945f93888f6acadd0bde6541f39d7616f9a5392;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

1945f93888f6acadd0bde6541f39d7616f9a5392