From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 13 Mar 2012 12:15:46 +0000 (+0000)
Subject: Merged upstream change.
X-Git-Tag: v3.3.0a2~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cac309939378f806daa3459afde0908267b070a;p=python

Merged upstream change.
---

3cac309939378f806daa3459afde0908267b070a