From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 Mar 2013 12:56:16 +0000 (-0400)
Subject: merge 2.7.4 release branch (#17550)
X-Git-Tag: v2.7.5~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b394db41f7d5347e4a4083305bfcda562bc38f8;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch (#17550)
---

4b394db41f7d5347e4a4083305bfcda562bc38f8