From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Mon, 31 Oct 2011 16:46:25 +0000 (+0100)
Subject: merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a57afee04ad569a274880b526d39954d06ef53e;p=python

merge with 3.2
---

6a57afee04ad569a274880b526d39954d06ef53e