From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 Aug 2014 22:20:00 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v2.7.9rc1~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4426870275f0b12bc9b0d56de761505098dd172b;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

4426870275f0b12bc9b0d56de761505098dd172b