From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Mar 2012 21:13:35 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d74b70e51436a3fab3c3eb35bab6566b60b65eb;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

7d74b70e51436a3fab3c3eb35bab6566b60b65eb