From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 11 Jul 2014 04:37:31 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8934961da800107462544b1c432cd9f01887d7fe;p=python

Merge with 3.4
---

8934961da800107462544b1c432cd9f01887d7fe