From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 9 May 2011 15:40:42 +0000 (+0300)
Subject: Merge with 3.1.
X-Git-Tag: v3.2.1rc1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=219a5dcc7864d58e78a45e5212064aa257d178a1;p=python

Merge with 3.1.
---

219a5dcc7864d58e78a45e5212064aa257d178a1