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

merge 3.1
---

fdb2d909a47dde62ef617bf4c52518325c2c48e7