From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Sep 2014 22:55:02 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.9rc1~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2c432845c3f0e112487596c5538a0f099f51c7c;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

b2c432845c3f0e112487596c5538a0f099f51c7c