From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 May 2012 19:39:27 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a4~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee2bbed9252fe286bc14765992877e1502b70328;p=python

Merged upstream changes.
---

ee2bbed9252fe286bc14765992877e1502b70328