From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 24 Dec 2011 22:13:39 +0000 (+0100)
Subject: merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91d9152919a9dadf57e01801a7a86e112546807b;p=python

merge with 3.2
---

91d9152919a9dadf57e01801a7a86e112546807b