From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 24 Dec 2011 02:02:12 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~530
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a883e566ac5e97eaf0b3221a54326c448697537f;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

a883e566ac5e97eaf0b3221a54326c448697537f