From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Nov 2014 16:51:48 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6;p=python

merge 2.7.9 release branch
---

d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6