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

Merge with 3.4
---

d6dd534924d4b5178cca9391025eeb440256b342