From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 15 Feb 2014 14:59:39 +0000 (+0200)
Subject: #19890: merge with 3.3.
X-Git-Tag: v3.4.1rc1~233^2~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=504f6e8653f7d8ccd81ee8376149a54e2a3f839d;p=python

#19890: merge with 3.3.
---

504f6e8653f7d8ccd81ee8376149a54e2a3f839d