From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 15 Aug 2014 05:23:15 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1070
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae94706a30c99150982034d644d8b3abf28110b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

eae94706a30c99150982034d644d8b3abf28110b