From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 22 Apr 2014 05:11:49 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1811
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f16fa11d297061073b7650c857c755875cb7b144;p=python

Merge with 3.4
---

f16fa11d297061073b7650c857c755875cb7b144