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

merge 3.2
---

c07f3be4e01a7824420622a7355bf40b1685d6bc