From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Jun 2011 23:51:37 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12aebabd99b2419eaea336b27701107a92fce19d;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

12aebabd99b2419eaea336b27701107a92fce19d