From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2011 17:51:32 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abf22b405fb15835ac9e1a732dee624c1a6c805a;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

abf22b405fb15835ac9e1a732dee624c1a6c805a