From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 20 May 2014 02:55:59 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1625
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92ab9a183c25a223b8cd9264a28792abaa85483a;p=python

Merge with 3.4
---

92ab9a183c25a223b8cd9264a28792abaa85483a