From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Mar 2011 23:18:09 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2741
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb2389be0e00551d42ddd5eaa89adef8eb48c8dd;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

eb2389be0e00551d42ddd5eaa89adef8eb48c8dd