From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 8 May 2011 17:00:03 +0000 (+0300)
Subject: Merge with 3.1.
X-Git-Tag: v3.2.1rc1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a743741bfc1549fb364cec4576e20c8f16f4c99;p=python

Merge with 3.1.
---

1a743741bfc1549fb364cec4576e20c8f16f4c99