From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 11 Jul 2014 04:16:16 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1302
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55740d73b30d5b7b866a9288084a4c43dd64baab;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

55740d73b30d5b7b866a9288084a4c43dd64baab