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

Merge with 3.4
---

cd09571894d8e0a872552082ee394b370f84b71c