From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 20 Jun 2014 19:17:01 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e079147870a44eb3ca54aff5222d655175fb912c;p=python

Merge with 3.4
---

e079147870a44eb3ca54aff5222d655175fb912c