From: Roger Serwy <roger.serwy@gmail.com>
Date: Sun, 31 Mar 2013 21:11:51 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~1056
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e268196fb0f1b0b0e10af49907a6356db1527d7b;p=python

Merge heads.
---

e268196fb0f1b0b0e10af49907a6356db1527d7b