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

merge 3.1
---

c704378987a8347d628b6c0f4c302ecda6d757d0