From: Ned Deily <nad@acm.org>
Date: Mon, 1 Sep 2014 07:08:00 +0000 (-0700)
Subject: Issue #22320: merge from 3.4
X-Git-Tag: v3.5.0a1~985
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a847eddea902224bfbd5a81aef54eb501fa24806;p=python

Issue #22320: merge from 3.4
---

a847eddea902224bfbd5a81aef54eb501fa24806