From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 Jun 2014 07:05:53 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a518f02e254c977f9417a6a6eff3540dcf438ef;p=python

Merge with 3.4
---

4a518f02e254c977f9417a6a6eff3540dcf438ef