From: Georg Brandl <georg@python.org>
Date: Sun, 6 May 2012 19:39:59 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a4~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75d5d8c78157f24f07b3fc122b7aeb07e0eea8ec;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

75d5d8c78157f24f07b3fc122b7aeb07e0eea8ec