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

Merge with 3.4
---

35a1fb1fba127ab7aba1d1af2c12e0d743d48c04