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

Merge with 3.4
---

f2e500c133f4130ab7b4a1d7e0ee1f08f41dbf61