From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 9 Jul 2012 08:25:46 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0b2~263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc9f0eca7ac25519b4dd54de48d0ba1af56344f;p=python

Merged upstream changes.
---

6dc9f0eca7ac25519b4dd54de48d0ba1af56344f