From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 3 Jan 2012 22:26:34 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~483
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c095956ca58b25fe2a4929de538e2eaf1a609852;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

c095956ca58b25fe2a4929de538e2eaf1a609852