From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 14 Jun 2012 13:37:53 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0b1~237^2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=474eb23b7fb0f66315eb975a712433ee8c247e68;p=python

merge 3.2
---

474eb23b7fb0f66315eb975a712433ee8c247e68