From: Georg Brandl <georg@python.org>
Date: Sat, 17 Mar 2012 15:58:12 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ba1428911370cb8c98572ac4ceb3b4ea2e04ad3;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

2ba1428911370cb8c98572ac4ceb3b4ea2e04ad3