From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 24 Aug 2014 02:22:07 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1016
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa6e73bac93957136d0e41e3f09572995d95f4cc;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

fa6e73bac93957136d0e41e3f09572995d95f4cc