From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 28 Mar 2011 10:53:40 +0000 (+0300)
Subject: #10617: merge with 3.1.
X-Git-Tag: v3.2.1b1~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ef2b46a0ab99bbcdb56405dfeefaa0b5ea4ebdf;p=python

#10617: merge with 3.1.
---

7ef2b46a0ab99bbcdb56405dfeefaa0b5ea4ebdf