From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 7 May 2011 12:44:50 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a1~2374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=052a899d5a38c4aaac09d86f2f8d1f6093f866c0;p=python

Merge.
---

052a899d5a38c4aaac09d86f2f8d1f6093f866c0