From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 29 Jun 2011 02:49:40 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d8fcfcf78622d1d5253c2f71878414bf4b54e9;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

84d8fcfcf78622d1d5253c2f71878414bf4b54e9