From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Feb 2012 00:09:38 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bbb6e8cf9832195cdf5ef6abb2109011a99174c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

7bbb6e8cf9832195cdf5ef6abb2109011a99174c