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

Merge with 3.4
---

f80c0f6eac98d57d4e8e79119768929cccc9a0e4