From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 18 Oct 2014 21:10:32 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~632
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36d99dcf2b890b7867f54a3ca973e050a5e4115e;p=python

Merge with 3.4
---

36d99dcf2b890b7867f54a3ca973e050a5e4115e