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

merge 3.2
---

d2edfd64bafc00496b80f4febb4e28cfea6ed4a9