From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 14 Oct 2014 20:56:57 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eb1896a8fb86464b84f57a51a5352a86eee001d;p=python

Merge with 3.4
---

0eb1896a8fb86464b84f57a51a5352a86eee001d