From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Jul 2014 19:01:29 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1229^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22084fc8ba8d1e585b9c837711d4d93af2378dc3;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

22084fc8ba8d1e585b9c837711d4d93af2378dc3