From: Georg Brandl <georg@python.org>
Date: Sun, 18 Dec 2011 18:32:37 +0000 (+0100)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~570^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f928b5d27ecd6edd3adb0b8a455dce657ffa2e34;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

f928b5d27ecd6edd3adb0b8a455dce657ffa2e34