From: Tim Golden <mail@timgolden.me.uk>
Date: Fri, 29 Jun 2012 17:45:40 +0000 (+0100)
Subject: Dummy merge from 3.2
X-Git-Tag: v3.3.0b2~363^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27982d703223898cafb625af055479c0a53b1dbe;p=python

Dummy merge from 3.2
---

27982d703223898cafb625af055479c0a53b1dbe