From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 20 Jun 2014 21:49:25 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d51a76f668811c03a03ead9f51f8de7fd38b9981;p=python

Merge with 3.4
---

d51a76f668811c03a03ead9f51f8de7fd38b9981