From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 25 May 2014 22:44:28 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1599
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c738874024106d28d7ce244cf9410cfc33246776;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

c738874024106d28d7ce244cf9410cfc33246776