From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Apr 2013 14:00:24 +0000 (-0400)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9db034161ea7d9ab47ffbb00344221078b0ed3a5;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch
---

9db034161ea7d9ab47ffbb00344221078b0ed3a5