From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 20 Sep 2014 02:54:27 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~895
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f63336723193d9560a184ef803bc1d723d2a735d;p=python

Merge with 3.4
---

f63336723193d9560a184ef803bc1d723d2a735d