From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 26 Oct 2012 16:35:00 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~2166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da2bd6caca34eb9c52e7262680b067ace7ac6f7d;p=python

Merge heads.
---

da2bd6caca34eb9c52e7262680b067ace7ac6f7d