From: Michael Foord <michael@voidspace.org.uk>
Date: Sun, 25 Mar 2012 17:16:26 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3eabb6f8eb0c8f9e5c3d2ecd6f60a96567624b3;p=python

Merge
---

a3eabb6f8eb0c8f9e5c3d2ecd6f60a96567624b3