From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 29 Jun 2011 02:49:49 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2023
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f86193a689e6e017f1df4d8f14d1b7e9a2ffc6f;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

4f86193a689e6e017f1df4d8f14d1b7e9a2ffc6f