From: Ned Deily <nad@acm.org>
Date: Tue, 11 Jun 2013 21:40:23 +0000 (-0700)
Subject: Issue #18187: merge from 3.3
X-Git-Tag: v3.4.0a1~530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=982c6efeb55a59bebb43ef6ac1d8e969105e8dd1;p=python

Issue #18187: merge from 3.3
---

982c6efeb55a59bebb43ef6ac1d8e969105e8dd1