From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 24 Sep 2012 14:08:05 +0000 (+0300)
Subject: #16017: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5799a2d8c3c57b131004a948fca6af3e42547cf6;p=thirdparty%2FPython%2Fcpython.git

#16017: merge with 3.2.
---

5799a2d8c3c57b131004a948fca6af3e42547cf6