From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 12 Jan 2012 02:00:48 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~439
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ab2a26865963ae1a521ae2dee3c71d4bf5b9532;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

0ab2a26865963ae1a521ae2dee3c71d4bf5b9532