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

merge 3.2
---

4032802eb6ed855fe34fffe4ae2d2c07f6e38c61