From: Georg Brandl <georg@python.org>
Date: Sun, 5 Feb 2012 08:28:39 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~244
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cf04487acda2dcdc3837fab5498c66921c514bd;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

2cf04487acda2dcdc3837fab5498c66921c514bd