From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 20 Oct 2013 23:53:30 +0000 (+0300)
Subject: #19238, #19289: merge with 3.3.
X-Git-Tag: v3.4.0b1~571^2~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=632f1bfd3902e0b020ba697cdb7b31df7b2656d6;p=thirdparty%2FPython%2Fcpython.git

#19238, #19289: merge with 3.3.
---

632f1bfd3902e0b020ba697cdb7b31df7b2656d6