From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 10 Dec 2014 15:58:13 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e57af0f61f50368c63ece9bd1ff32903e6fcad4a;p=python

merge 2.7.9 release branch
---

e57af0f61f50368c63ece9bd1ff32903e6fcad4a