From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 8 Sep 2012 20:43:17 +0000 (-0400)
Subject: Merge Ezio's 'merge heads'.
X-Git-Tag: v3.3.1rc1~818^2^2~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=230f6621fa80be4e4c43d5d5b8d3ea0e851a736a;p=python

Merge Ezio's 'merge heads'.
---

230f6621fa80be4e4c43d5d5b8d3ea0e851a736a