From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 May 2015 22:13:31 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca1ad9423b2e7b9c4a7b035a94f6b007346e4764;p=python

Merge with 3.4
---

ca1ad9423b2e7b9c4a7b035a94f6b007346e4764