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

Merge with 3.4
---

c763807d9bed84aeeb737c0e8ea1c238d59c99b6