From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 27 Aug 2014 05:44:13 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1004
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfb110d8a3e9bb4a1f932e8e52a3ce8765c86cef;p=python

Merge with 3.4
---

dfb110d8a3e9bb4a1f932e8e52a3ce8765c86cef