From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Thu, 5 Apr 2012 20:59:41 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.0a3~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3c3f24736ac26369c9562a8823a19a7420f59db;p=python

merge heads
---

e3c3f24736ac26369c9562a8823a19a7420f59db