From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Fri, 11 Jan 2013 09:49:43 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1647^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba8279f252afca1c04f1a33472c769ef3479e6e2;p=python

merge with 3.3
---

ba8279f252afca1c04f1a33472c769ef3479e6e2