From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 18 May 2014 23:33:28 +0000 (-0700)
Subject: merge 2.7.7 release branch
X-Git-Tag: v2.7.8~37^2~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c5a61f6710b2ab394f0add894d2b3ecaf3c8a7b;p=python

merge 2.7.7 release branch
---

2c5a61f6710b2ab394f0add894d2b3ecaf3c8a7b