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

merge with 3.2
---

8f7bded7e0118d79615b9ac4a639aba7a4346bca