From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 27 Feb 2012 11:03:55 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01121f2d5ab06ae5d4771df7ce7b75e520f4a76c;p=python

Merged upstream changes.
---

01121f2d5ab06ae5d4771df7ce7b75e520f4a76c