From: Meador Inge <meadori@gmail.com>
Date: Sun, 14 Apr 2013 01:59:03 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~948
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e94950ea3f4241c0c228db685314c012515684b3;p=python

Merge heads.
---

e94950ea3f4241c0c228db685314c012515684b3