From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 10 Jul 2014 05:17:11 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6e9f36e544ea7443bc3bdd959968e65817994e9;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f6e9f36e544ea7443bc3bdd959968e65817994e9