From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 10 Apr 2013 16:35:31 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.4.0a1~992
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe2d27d068ac4ee1773e2b7d7f5719efc2210917;p=python

Merge heads.
---

fe2d27d068ac4ee1773e2b7d7f5719efc2210917