From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Fri, 26 Apr 2013 13:24:42 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a1~844
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3da670749a25a9ea068c427f6b03812b92e75d13;p=python

merge heads
---

3da670749a25a9ea068c427f6b03812b92e75d13