From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 23 Feb 2012 20:51:57 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a1~81^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13d244f72ec37e2a43c89527e77e0524b8119bdc;p=python

Merged upstream changes.
---

13d244f72ec37e2a43c89527e77e0524b8119bdc