From: Georg Brandl <georg@python.org>
Date: Sat, 30 Jul 2011 07:01:03 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1803
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39112a964348aa1fb0ccd08d92eef2fd0c0fbabc;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

39112a964348aa1fb0ccd08d92eef2fd0c0fbabc