From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 10 Jun 2014 06:49:54 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb5ba067c9d38aaa4bba6bb4c87355b5eae6eba0;p=python

Merge with 3.4
---

eb5ba067c9d38aaa4bba6bb4c87355b5eae6eba0