From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 4 Apr 2013 02:35:28 +0000 (-0400)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf517170229707e383b808aef1234db0dd82b02a;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.4 release branch
---

bf517170229707e383b808aef1234db0dd82b02a