From: Ned Deily <nad@acm.org>
Date: Thu, 27 Mar 2014 06:33:28 +0000 (-0700)
Subject: Issue #20939: merge from 3.4
X-Git-Tag: v3.5.0a1~2020
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c74e48566fd83fe85ba1a642f89c5485cb65843c;p=python

Issue #20939: merge from 3.4
---

c74e48566fd83fe85ba1a642f89c5485cb65843c