From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 12 Jan 2013 08:40:24 +0000 (+0200)
Subject: #16940: merge with 3.2.
X-Git-Tag: v3.3.1rc1~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9895ab463b122a43ab237a72323b47dc548324af;p=python

#16940: merge with 3.2.
---

9895ab463b122a43ab237a72323b47dc548324af