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

Merge with 3.4
---

74aee426c166241c8c0f2a64d22e0b4b9e53443b