From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Wed, 28 Nov 2012 10:47:45 +0000 (-0800)
Subject: Null merge from 3.3.
X-Git-Tag: v3.4.0a1~1940
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6dfe542d7d88dc3a9a96156211e54974494f3e9;p=python

Null merge from 3.3.
---

a6dfe542d7d88dc3a9a96156211e54974494f3e9