From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 16 Apr 2014 03:44:37 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1852
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2dfa927041d576dd9c7242179732ff8a05b1382;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f2dfa927041d576dd9c7242179732ff8a05b1382