From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 10 Oct 2014 20:00:39 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~705
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=082c6cb18321ca07be0284b837b17da363d797e2;p=python

Merge with 3.4
---

082c6cb18321ca07be0284b837b17da363d797e2