From: Eric V. Smith <eric@trueblade.com>
Date: Tue, 2 Jul 2013 13:07:53 +0000 (-0400)
Subject: #18312: merge from 3.3.
X-Git-Tag: v3.4.0a1~339
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee31bc09cf7449963be9f3fc1f440cee85aeb2e7;p=python

#18312: merge from 3.3.
---

ee31bc09cf7449963be9f3fc1f440cee85aeb2e7