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

Merge with 3.4
---

5427df266bb32970527a03a05af4f845a04b8f9e