From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 9 Oct 2014 00:29:32 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~731
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7b68f30a72f5eea81e4df965639631ee6575de8;p=python

Merge with 3.4
---

d7b68f30a72f5eea81e4df965639631ee6575de8