From: Georg Brandl <georg@python.org>
Date: Mon, 1 Aug 2011 20:59:40 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~1784
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0fa4b843324ddebce03f13aa27021ed3d03332d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

b0fa4b843324ddebce03f13aa27021ed3d03332d