From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 9 Dec 2012 15:14:42 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.4rc1~284
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ee03fa4d52e2d7572f4a75127bfa18aac963782;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

4ee03fa4d52e2d7572f4a75127bfa18aac963782