From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Dec 2014 01:16:53 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af18b4cb550ff9c12eb7d1e0fe8a808d0c6243f8;p=python

merge 2.7.9 release branch
---

af18b4cb550ff9c12eb7d1e0fe8a808d0c6243f8