From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 28 Mar 2011 22:25:50 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3077404de4ce8efe5214f4dbf973421eebdf1181;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

3077404de4ce8efe5214f4dbf973421eebdf1181