From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 8 Jun 2014 18:49:30 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1490
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaeb0d060c2f80eefd64558eb250582406e930fb;p=python

Merge with 3.4
---

eaeb0d060c2f80eefd64558eb250582406e930fb