From: Michael Foord <michael@python.org>
Date: Tue, 15 Mar 2011 23:22:19 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2896
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed1fce2ee5c1e8c44d5c1500962f2f509ffb37d6;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

ed1fce2ee5c1e8c44d5c1500962f2f509ffb37d6