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

Merge with 3.4
---

62e582cdb491df5a7c9acba6bae8ce9767a69406