From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 17 Jun 2014 20:35:33 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b1fe97e9505e605201a1d27a6d6a90898a8303d;p=python

Merge with 3.4
---

1b1fe97e9505e605201a1d27a6d6a90898a8303d