From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Mar 2013 21:19:20 +0000 (-0500)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40d1cfece59e50d89187d2dd31f9e595e04aaa3c;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch
---

40d1cfece59e50d89187d2dd31f9e595e04aaa3c