From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Aug 2011 15:49:16 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1682
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=020340f2841ec2b70b9e09921850d16019d0667e;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

020340f2841ec2b70b9e09921850d16019d0667e