From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 May 2011 19:17:19 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a290bac5b1cc415ce4efd50525870c0c505c9840;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

a290bac5b1cc415ce4efd50525870c0c505c9840