From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 25 Feb 2012 09:47:30 +0000 (+0100)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a3d04623b0dc8219326989bc3619d5f56737a94;p=python

Merge with 3.2
---

5a3d04623b0dc8219326989bc3619d5f56737a94