From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 7 Jun 2014 08:28:16 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1491^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7244d775db858004d8cc21869e79d4eebc27887b;p=python

Merge with 3.4
---

7244d775db858004d8cc21869e79d4eebc27887b