From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 18 May 2012 12:25:54 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0a4~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91d5e837cab7d2080139581c2f21899d7d3a6841;p=python

merge 3.2
---

91d5e837cab7d2080139581c2f21899d7d3a6841