From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 13 Oct 2014 02:59:18 +0000 (-0400)
Subject: Merge with 3.4 #22614
X-Git-Tag: v3.5.0a1~674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fb369c0d318481b3931821fe517c628814df03a;p=python

Merge with 3.4 #22614
---

2fb369c0d318481b3931821fe517c628814df03a