From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 18 Sep 2013 11:35:30 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.4.0a3~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fedddef577aeda121c8495f2a9299b25ddb3aee;p=python

Merge heads.
---

4fedddef577aeda121c8495f2a9299b25ddb3aee