From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Apr 2011 18:16:14 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2454
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a5097244aa1dc40bd278b26285e8d9d01bc0876;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

1a5097244aa1dc40bd278b26285e8d9d01bc0876