From: Georg Brandl <georg@python.org>
Date: Mon, 20 Feb 2012 20:43:25 +0000 (+0100)
Subject: Merge with 3.1.
X-Git-Tag: v3.2.3rc1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9dafe618f9c157733bcbefb956348a99eb2ca3e;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.1.
---

b9dafe618f9c157733bcbefb956348a99eb2ca3e