From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 Jun 2014 07:31:33 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69e3dbcb86c46408572b1541f7fa879b971c9d5f;p=python

Merge with 3.4
---

69e3dbcb86c46408572b1541f7fa879b971c9d5f