From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Dec 2011 16:13:05 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~548
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97193c1a1600141107e78c851058098404c73d62;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

97193c1a1600141107e78c851058098404c73d62