From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 8 Jan 2015 04:49:06 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef50fdf13817dd09389aa693669dca83e3618a15;p=python

Merge with 3.4
---

ef50fdf13817dd09389aa693669dca83e3618a15