From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 14 Oct 2014 22:55:49 +0000 (-0400)
Subject: Merge with 3.4 #3068
X-Git-Tag: v3.5.0a1~659
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c597d5c318dc9af27d99a70074688578caf82890;p=python

Merge with 3.4 #3068
---

c597d5c318dc9af27d99a70074688578caf82890