From: Christian Heimes <christian@cheimes.de>
Date: Sun, 7 Oct 2012 20:45:14 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~2309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8463e9cfd5e438ad5fcc57431bd270f2f53a100;p=python

merge
---

d8463e9cfd5e438ad5fcc57431bd270f2f53a100