From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 12:56:46 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~2245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15a9bae20a0508a14ef684ddd74be285471fe7d2;p=python

Merge heads.
---

15a9bae20a0508a14ef684ddd74be285471fe7d2