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

merge 2.7.4 release branch
---

6909ab5e8a2d0ddaea2c5e0c95f72136ad8b323d