From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 15 Mar 2011 17:21:03 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3796befe3780b1d2cf66ec36b96167a05ae6c58c;p=python

Merge with 3.2
---

3796befe3780b1d2cf66ec36b96167a05ae6c58c