From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 2 Jun 2012 16:22:31 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0b1~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a894cbfa61392d88dff62bc60793000349e961ec;p=python

merge with 3.2
---

a894cbfa61392d88dff62bc60793000349e961ec