From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 12 May 2014 03:35:35 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1680
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9ee1f50e578e1c4a18c9436d3087b065b81c39f;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

d9ee1f50e578e1c4a18c9436d3087b065b81c39f