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

Merge with 3.4
---

cd41e89377940b2c3e0267df2ea0b84c27ae453b