From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 11:48:34 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.3.1rc1~796
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a420227488aa743e20c27368ee64a114c1d651f;p=python

Merge heads.
---

8a420227488aa743e20c27368ee64a114c1d651f