From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 1 Jul 2014 03:52:32 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c8ae8447ea03a2cd10bba13b6efa8ee48df51ab;p=python

Merge with 3.4
---

3c8ae8447ea03a2cd10bba13b6efa8ee48df51ab