From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 11 Apr 2012 20:48:30 +0000 (-0400)
Subject: merge 3.1 (null)
X-Git-Tag: v3.3.0a3~253^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=118ef7c38fc3886c11877649610fcf69a84f6138;p=thirdparty%2FPython%2Fcpython.git

merge 3.1 (null)
---

118ef7c38fc3886c11877649610fcf69a84f6138