From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 10 Apr 2012 19:01:35 +0000 (+0100)
Subject: Merged upstream change.
X-Git-Tag: v2.7.4rc1~911^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5628fff98db90557a798c645f3bc28a097a11613;p=python

Merged upstream change.
---

5628fff98db90557a798c645f3bc28a097a11613