From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sun, 24 Jun 2012 10:24:05 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0b1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd7987382d538ef7d9e90dacaee422f1a414060e;p=python

Merged upstream changes.
---

dd7987382d538ef7d9e90dacaee422f1a414060e