From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 22 Jul 2011 15:55:02 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1863
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86f088e8e50632ee28bbf2366d48b2e503244fcd;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

86f088e8e50632ee28bbf2366d48b2e503244fcd