From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 13 Jun 2014 18:23:57 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1452
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eba3633f345e79866e53d1acdce57858079a2358;p=python

Merge with 3.4
---

eba3633f345e79866e53d1acdce57858079a2358