From: Petri Lehtinen <petri@digip.org>
Date: Sat, 5 Nov 2011 20:06:49 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~934
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1d0849d188045a97755f131deacd2e5f859b111;p=python

Merge 3.2
---

d1d0849d188045a97755f131deacd2e5f859b111