From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 13 Jun 2014 18:58:09 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1450
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82fa90c06f98c3143377c75f98f7d7b187d4c863;p=python

Merge with 3.4
---

82fa90c06f98c3143377c75f98f7d7b187d4c863