From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 22 Apr 2014 05:27:06 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1810
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29c47776dd9f7b7f240a1cd3d4d61a1e98044ae9;p=python

Merge with 3.4
---

29c47776dd9f7b7f240a1cd3d4d61a1e98044ae9