From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 23 Mar 2012 14:38:12 +0000 (+0000)
Subject: Null merge for backported fix.
X-Git-Tag: v3.3.0a2~74^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=080e1cc33ab98a0ea4a2653b6ed090dd4ecb4fd8;p=python

Null merge for backported fix.
---

080e1cc33ab98a0ea4a2653b6ed090dd4ecb4fd8