From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 May 2014 20:20:25 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=069c87bee45190c52b765c410c008058e32daaa8;p=python

Merge with 3.4
---

069c87bee45190c52b765c410c008058e32daaa8