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

Merge with 3.4
---

bb0f3ee3869924727490111893b4c4f2e2a65db7