From: Georg Brandl <georg@python.org>
Date: Sun, 25 Mar 2012 18:32:35 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=288b9bf1ea3ed68b3238fb2f2d579370ffdb634b;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

288b9bf1ea3ed68b3238fb2f2d579370ffdb634b