From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 10 Dec 2014 23:49:02 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~348
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b46f5ac18f9826c9b38398cbc306de856c2f109;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

3b46f5ac18f9826c9b38398cbc306de856c2f109