From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 31 May 2012 11:38:55 +0000 (+0100)
Subject: Null merge from 3.2.
X-Git-Tag: v3.3.0b1~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48c2e4d0c248619e651c0a0124cbce10bb9d2d13;p=python

Null merge from 3.2.
---

48c2e4d0c248619e651c0a0124cbce10bb9d2d13