From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 5 Sep 2014 01:00:52 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~957
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ee44f7f5584b343ee26fb2be46ffde571a5e63d;p=python

Merge with 3.4
---

2ee44f7f5584b343ee26fb2be46ffde571a5e63d