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

merge with 3.2
---

9bf59aa103074ee0e926ef74743bb1eaa8229128