From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Fri, 1 Jun 2012 18:25:36 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.0b1~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be1bc8c41027ddbc9cb8b112dff5664aa02a631a;p=python

merge heads
---

be1bc8c41027ddbc9cb8b112dff5664aa02a631a