From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 1 Oct 2014 19:39:05 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf4d6997a3f421a9c5b83dcd92984182a8a5d98f;p=python

Merge with 3.4
---

cf4d6997a3f421a9c5b83dcd92984182a8a5d98f