From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Jul 2011 03:44:51 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1805
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7