From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 13 Apr 2011 04:21:24 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2599
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d01e78c9e5088a0373d87a1845b63ebc5e981da;p=python

Merge with 3.2.
---

7d01e78c9e5088a0373d87a1845b63ebc5e981da