From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2011 17:44:26 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17658a1ca0af87f43ca880b03c4368a81f3ad51a;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

17658a1ca0af87f43ca880b03c4368a81f3ad51a