From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 12 Jul 2013 20:04:18 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~228^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a03a7c79ca1fa331abab8746696847dbd9f80520;p=python

Merge heads.
---

a03a7c79ca1fa331abab8746696847dbd9f80520