From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 16:34:31 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.3.0a1~2131^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49e7bb9ea043069891692fedbcabbbd78219a481;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

49e7bb9ea043069891692fedbcabbbd78219a481