From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 1 Jun 2014 04:30:55 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1556
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3e50be6d01ac5abb2df8608e75ee8ca5c9ed7f7;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

d3e50be6d01ac5abb2df8608e75ee8ca5c9ed7f7