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

Merge with 3.4
---

c1d609e8c8be07ffeedc4ed88a6b80148443c5f3