From: Brian Curtin <brian@python.org>
Date: Thu, 9 Jun 2011 14:46:21 +0000 (-0500)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff