From: Ethan Furman <ethan@stoneleaf.us>
Date: Tue, 14 Oct 2014 15:59:14 +0000 (-0700)
Subject: Issue22506: merge from 3.4
X-Git-Tag: v3.5.0a1~664
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=987f3dd161c4390d5e458298b93f73fdb984ad6c;p=python

Issue22506: merge from 3.4
---

987f3dd161c4390d5e458298b93f73fdb984ad6c