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

merge 2.7.9 release branch
---

542125e6140e8a62911bbcf0b0465e9d56d37ec8