From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 27 May 2014 07:31:32 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1581
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1086fb0947bf5a599b28394c30acc65b911ce695;p=python

Merge with 3.4
---

1086fb0947bf5a599b28394c30acc65b911ce695