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

merge 2.7.4 release branch
---

2350ecd711095d4b4301656327bce47cb6fe940e