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

Merge heads.
---

8863bfe61892f9bf941f76db318ed03b8fc240ed