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

Merge with 3.4
---

cbd619bd6afa77210076c4a6d9c04e1308dd676e