From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 27 Dec 2012 21:52:36 +0000 (+0200)
Subject: Null merge with 3.2.
X-Git-Tag: v3.3.1rc1~472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a158be94e074d284c5371b957956af0e974443a;p=python

Null merge with 3.2.
---

8a158be94e074d284c5371b957956af0e974443a