From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Tue, 28 Feb 2012 21:29:08 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0109e3cd24c54050b5c894e53823e00df65c12b0;p=python

merge with 3.2
---

0109e3cd24c54050b5c894e53823e00df65c12b0