From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Feb 2012 16:30:05 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9878b63c7c70b33ea21cd06a2c30ca1344962f02;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

9878b63c7c70b33ea21cd06a2c30ca1344962f02