From: Michael Foord <michael@voidspace.org.uk>
Date: Fri, 28 Sep 2012 15:16:24 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.1rc1~818^2^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ec31c200621b52febdb9e02f7c36eddda37eb78;p=python

Merge
---

8ec31c200621b52febdb9e02f7c36eddda37eb78