From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 29 Jul 2014 02:24:20 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c95e88cd25499f81aea469c729b998c6cf4bd5b2;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

c95e88cd25499f81aea469c729b998c6cf4bd5b2