From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Wed, 13 Jun 2012 22:37:25 +0000 (+0200)
Subject: Issue #15060: merge with 3.2
X-Git-Tag: v3.3.0b1~237^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6a899fe6d39b5447abc5966a3dfe386b9d6656e;p=python

Issue #15060: merge with 3.2
---

f6a899fe6d39b5447abc5966a3dfe386b9d6656e