From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 3 Jun 2014 00:43:13 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b;p=python

Merge with 3.4
---

15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b