From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sun, 30 Sep 2012 16:46:55 +0000 (-0700)
Subject: Issue #15533: Merge update from 3.3.
X-Git-Tag: v3.4.0a1~2439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca42f00657d7b8920a7286302ca5b66b0a6d77b3;p=python

Issue #15533: Merge update from 3.3.
---

ca42f00657d7b8920a7286302ca5b66b0a6d77b3