From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 29 May 2012 11:53:00 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a4~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa88d32574af0645c0a44530c6539475821174fd;p=python

Merged upstream changes.
---

aa88d32574af0645c0a44530c6539475821174fd