From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 13 Jul 2014 21:27:41 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0a9a0156ec7c1cc917018027094d38f2dbf568d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

e0a9a0156ec7c1cc917018027094d38f2dbf568d