From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 12 Mar 2012 22:25:12 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a2~234^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56bac7b9e13cc77927383a5bf97f30c3211fc7a8;p=python

Merge
---

56bac7b9e13cc77927383a5bf97f30c3211fc7a8