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

Merge with 3.4
---

a52ecc0a02cbc2512c928ca97e2573072ab39655