From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 12 Apr 2013 13:24:12 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~975
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15a98cd30cc410289fee82be283dbd92b9ba1681;p=python

Merge heads.
---

15a98cd30cc410289fee82be283dbd92b9ba1681