From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 24 Mar 2012 16:40:50 +0000 (+0100)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecc92db031bd0df9ac294860e61a20dcfc226461;p=python

merge 3.2
---

ecc92db031bd0df9ac294860e61a20dcfc226461