From: Petri Lehtinen <petri@digip.org>
Date: Mon, 6 Feb 2012 20:04:41 +0000 (+0200)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a1~232^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96356d40b96ccbff772ab9f79e148f8c8e4724f0;p=python

Merge branch '3.2'
---

96356d40b96ccbff772ab9f79e148f8c8e4724f0