From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 21 Aug 2012 06:25:41 +0000 (+0200)
Subject: Merge 3.2.
X-Git-Tag: v3.3.0rc1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b27c53e36a909b451c1a87522fc41a7b16aa9e3;p=python

Merge 3.2.
---

5b27c53e36a909b451c1a87522fc41a7b16aa9e3