From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 27 Dec 2011 21:17:15 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~516
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5f6f2aba34dcf8f2a7e899aff0d7c37218502e9;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

a5f6f2aba34dcf8f2a7e899aff0d7c37218502e9