From: Trent Nelson <trent@trent.me>
Date: Wed, 17 Oct 2012 22:08:16 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.3.1rc1~782
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd35500073739c8b697dac7a84f323d5854cee39;p=python

Merge heads.
---

dd35500073739c8b697dac7a84f323d5854cee39