From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 22 Jul 2011 16:10:43 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1861
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a4b42b7f4ca0458a5a4aae24f42e207309b19b2;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

8a4b42b7f4ca0458a5a4aae24f42e207309b19b2