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

Merge with 3.4
---

062bc1de1961268a371e4f968a9e455c325c819f