From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 19 Aug 2014 23:47:51 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1021^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2d9ee67e13b0210a145028a2f2724cd687e7d9b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f2d9ee67e13b0210a145028a2f2724cd687e7d9b