From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 4 Nov 2013 21:35:33 +0000 (-0500)
Subject: merge 2.7.6 release branch
X-Git-Tag: v2.7.8~290^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e765a20003e7c5fd6a2add84c21849be345ecc7e;p=python

merge 2.7.6 release branch
---

e765a20003e7c5fd6a2add84c21849be345ecc7e