From: Petri Lehtinen <petri@digip.org>
Date: Tue, 26 Jun 2012 07:26:53 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.3.0b1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=239197411080a3d41fd9ddca19aaa63c7aa9304e;p=python

Merge heads
---

239197411080a3d41fd9ddca19aaa63c7aa9304e