From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 30 Jun 2014 20:09:44 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1372
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c26c51a96ed20dd0f3abf760e887c0e16ac68b7b;p=python

Merge with 3.4
---

c26c51a96ed20dd0f3abf760e887c0e16ac68b7b