From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 May 2011 19:17:35 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8255e0e9e154c5b9df7d36c1cdf3b67768d3376;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

d8255e0e9e154c5b9df7d36c1cdf3b67768d3376