From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 22 Jun 2014 05:20:52 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1441^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29ed8eec68fa75c4e1e909debc826ec7c6eb0e85;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

29ed8eec68fa75c4e1e909debc826ec7c6eb0e85