From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Jun 2014 05:03:35 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1460
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d8d9d57b5212aa8a563393218d5432097d200db;p=python

Merge with 3.4
---

2d8d9d57b5212aa8a563393218d5432097d200db