From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 10 Dec 2011 17:38:52 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~643
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3a345a21f4e07469622d148308637f0d5e69cf5;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

d3a345a21f4e07469622d148308637f0d5e69cf5