From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Mar 2011 11:54:21 +0000 (+0200)
Subject: Merge from 3.2.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2087d0a5aa33530ff220013af53e9b9947df485;p=python

Merge from 3.2.
---

a2087d0a5aa33530ff220013af53e9b9947df485