From: Petri Lehtinen <petri@digip.org>
Date: Tue, 22 May 2012 18:05:30 +0000 (+0300)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a4~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f17bcd4a15ea8ae927f94049e9decb709dcc6f4;p=python

Merge branch '3.2'
---

3f17bcd4a15ea8ae927f94049e9decb709dcc6f4