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

Merge heads.
---

f17512f67e545bfeda1905b63f80217e0b7853aa