From: Petri Lehtinen <petri@digip.org>
Date: Fri, 26 Oct 2012 19:40:56 +0000 (+0300)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~2165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28a79f8faf1a00e7027ab7fbc9c8b4899f64c500;p=python

Merge 3.3
---

28a79f8faf1a00e7027ab7fbc9c8b4899f64c500