From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Mar 2013 14:37:25 +0000 (-0400)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=337b1737df66a466d12effcee515653e0b6ad024;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch
---

337b1737df66a466d12effcee515653e0b6ad024