From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Jul 2014 06:59:17 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b1bcedd57f0f305ddb37a67c27b30f6d662a9d7;p=python

Merge with 3.4
---

3b1bcedd57f0f305ddb37a67c27b30f6d662a9d7