From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 2 Jun 2012 06:57:50 +0000 (-0700)
Subject: merge 3.2
X-Git-Tag: v3.3.0b1~308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a37b8393c9e38acbf6b9a7c575e4bde054802a0;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

3a37b8393c9e38acbf6b9a7c575e4bde054802a0