From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Wed, 28 Nov 2012 10:45:34 +0000 (-0800)
Subject: Merge heads.
X-Git-Tag: v3.3.1rc1~589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fb47587a147f4f0a8a0ce8c82c27ed8f566b888;p=python

Merge heads.
---

1fb47587a147f4f0a8a0ce8c82c27ed8f566b888