From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 15 Jul 2014 03:07:47 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24fb2d4012d6bc89284f5160b7415e98d294d569;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

24fb2d4012d6bc89284f5160b7415e98d294d569