From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 12:56:41 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.3.1rc1~793
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ecd00402eec2fc3238f4db6a30b25843956c179;p=python

Merge heads.
---

5ecd00402eec2fc3238f4db6a30b25843956c179