From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 25 Jun 2014 02:21:56 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1416
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5827da3f9f79e37bd15e8a1ff52d0744e611d81b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

5827da3f9f79e37bd15e8a1ff52d0744e611d81b