From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 10 Sep 2012 12:06:02 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.1rc1~818^2^2~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3a2c5980688711e804129abe67d361b295f419d;p=python

Merge
---

c3a2c5980688711e804129abe67d361b295f419d