From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 02:55:51 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~319
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fb0cf7b87b4122e71799c0bd9c485d89262ef84;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

4fb0cf7b87b4122e71799c0bd9c485d89262ef84