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

merge 2.7.9 release branch
---

e4d2ba7e0b112c3fd5b472c50c90557a423512c4