From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 May 2011 22:39:40 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cee01bf18faa9eb95b93c24711cbebbe36d91336;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

cee01bf18faa9eb95b93c24711cbebbe36d91336