From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2011 11:57:43 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1569
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2825c0b7d9ba49f30c69634f3852093fc1ed5928;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

2825c0b7d9ba49f30c69634f3852093fc1ed5928