From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 29 Apr 2014 05:19:41 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1771
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=727a463aa624931a89c796bfa4fe5711e2c403ff;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

727a463aa624931a89c796bfa4fe5711e2c403ff