From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 20 Aug 2012 12:42:59 +0000 (+0200)
Subject: Merge 3.2.
X-Git-Tag: v3.3.0rc1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0c03be53e15cd2e724808d83031d939da8fa57b;p=python

Merge 3.2.
---

c0c03be53e15cd2e724808d83031d939da8fa57b