From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 6 May 2012 13:55:17 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.3.0a4~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49233c4e474a3955558ec1cb2f784150ba0d5ea1;p=python

Merge heads.
---

49233c4e474a3955558ec1cb2f784150ba0d5ea1