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

Merge with 3.4
---

9b1df38d5633b5e53f3b6a0b387fe2eb6b4fba8f