From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 23 Oct 2014 00:16:17 +0000 (-0400)
Subject: Merge with 3.4 #3068
X-Git-Tag: v3.5.0a1~619
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637e1ab960d22635c168be823735438d3af30ee2;p=python

Merge with 3.4 #3068
---

637e1ab960d22635c168be823735438d3af30ee2