From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 24 Mar 2013 03:32:34 +0000 (-0500)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc1d9c99630cff1b812d27f251f2fa69387d4379;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch
---

bc1d9c99630cff1b812d27f251f2fa69387d4379