From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 9 Jun 2011 17:43:11 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a1~2147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf353aadf274b898a515e81c2b1d63fbac83feca;p=python

Merged upstream changes.
---

bf353aadf274b898a515e81c2b1d63fbac83feca