From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 26 Jul 2014 23:40:31 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cf85694e6a2518d48a2e211fbdc76a289be10fa;p=python

Merge with 3.4
---

4cf85694e6a2518d48a2e211fbdc76a289be10fa