From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Apr 2011 04:39:08 +0000 (+0300)
Subject: #4783: Merge with 3.1.
X-Git-Tag: v3.2.1b1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34d204bc85074a96754e4cd1f23f1c148d0d9aaa;p=python

#4783: Merge with 3.1.
---

34d204bc85074a96754e4cd1f23f1c148d0d9aaa