From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 23 Sep 2011 17:53:06 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1500
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3454d524344bf8a0cbe5178ef299e52fcbc0dc84;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

3454d524344bf8a0cbe5178ef299e52fcbc0dc84