From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Dec 2014 19:19:24 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e836facb0f2184e5077f924d2fd33e528f0ed05;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.9 release branch
---

8e836facb0f2184e5077f924d2fd33e528f0ed05