From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 15 Feb 2014 11:01:41 +0000 (+0200)
Subject: #20634: merge with 3.3.
X-Git-Tag: v3.4.1rc1~233^2~324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48eabbeffd200d6bc9c994d1dd49319bbc64ae6b;p=thirdparty%2FPython%2Fcpython.git

#20634: merge with 3.3.
---

48eabbeffd200d6bc9c994d1dd49319bbc64ae6b