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

merge 2.7.9 release branch
---

3660198a352895e83d74722ab8fdae1a1d3dc816