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

Merge with 3.4
---

49c02b62ddc4e2aad10ae3a19e257bc76e374658