From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 10 Aug 2013 16:13:44 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.4.0a2~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13f4cd6c1041be3d1899be5d11c1ead767d2265b;p=python

Merge heads.
---

13f4cd6c1041be3d1899be5d11c1ead767d2265b