From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 6 Oct 2014 06:04:48 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dedc638ec820e1e3c9f5223c2e47a7c5f74ccfb;p=python

Merge with 3.4
---

9dedc638ec820e1e3c9f5223c2e47a7c5f74ccfb