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

Merge with 3.4
---

f2d9526391e99b1877134215ea1382b7b02157eb