From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 2 Jul 2014 01:33:46 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e456973a5de01082f9233beffb7fd2b05f6f9b0;p=python

Merge with 3.4
---

5e456973a5de01082f9233beffb7fd2b05f6f9b0