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

Merge with 3.4
---

e9dcfd1870184ac4ac4c747e7ca4b9f9f32af6a1