From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 Jul 2012 18:53:03 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0b2~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7df5e5858b846b9de6dd1148d13e105712c8b1e1;p=python

merge 3.2
---

7df5e5858b846b9de6dd1148d13e105712c8b1e1