From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 8 Sep 2012 09:19:27 +0000 (+0200)
Subject: Merge 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea94ba45fa845e5792020ffb5bb70f88f8642366;p=python

Merge 3.2.
---

ea94ba45fa845e5792020ffb5bb70f88f8642366