From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Oct 2011 18:24:59 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1022
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cebc207ea415f96a56f23b520adddeda3364fdc;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

1cebc207ea415f96a56f23b520adddeda3364fdc