From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 1 Jul 2014 00:00:16 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e9e6c76448fbad4f1e921e05fa15b1224f8f473;p=python

Merge with 3.4
---

2e9e6c76448fbad4f1e921e05fa15b1224f8f473