From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 26 Jan 2013 23:33:22 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=876a58b8d1758d81ee68c20b4b96333d0ad9c14d;p=python

merge with 3.3
---

876a58b8d1758d81ee68c20b4b96333d0ad9c14d