From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 4 Dec 2014 05:55:16 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c50041880d5e3621ab2d605a00871146d1f47174;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

c50041880d5e3621ab2d605a00871146d1f47174