From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Mar 2013 19:31:31 +0000 (-0400)
Subject: merge 2.7.4 release branch
X-Git-Tag: v2.7.5~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0;p=python

merge 2.7.4 release branch
---

472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0