From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 5 Jul 2011 03:28:00 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1948
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9797e29f86eac1504a518ee5a4bf5b3b53c24c63;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

9797e29f86eac1504a518ee5a4bf5b3b53c24c63