From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 May 2012 13:22:45 +0000 (-0400)
Subject: merge 3.2 (#14752)
X-Git-Tag: v3.3.0a4~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cffbac2cbab551a829f0c843233ec98827947b3;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#14752)
---

1cffbac2cbab551a829f0c843233ec98827947b3