From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 25 Jun 2011 17:30:52 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.3.0a1~2045
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=935fa016f48d794253257e6a8e65c091593a7664;p=python

Merge heads.
---

935fa016f48d794253257e6a8e65c091593a7664