From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Jan 2012 01:33:52 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df13b5fae13f0a4aa9689d0873bc433960129a0c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

df13b5fae13f0a4aa9689d0873bc433960129a0c