From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 9 Aug 2014 03:33:32 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1098
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1a98f50e64d67f89efc6f66f47d7a1e55caaa55;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f1a98f50e64d67f89efc6f66f47d7a1e55caaa55