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

Merge with 3.4
---

679a2feb80ad25c2ef47e1d208f3cf81452f00b7