From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 24 Jun 2012 20:04:02 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v3.3.0b1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=becb70c329eb7202cfb1cf2c9bbd8979e3662949;p=python

Merge heads.
---

becb70c329eb7202cfb1cf2c9bbd8979e3662949