From: Christian Heimes <christian@cheimes.de>
Date: Thu, 5 Sep 2013 14:06:46 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a2~27^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1d5e543e445de65789be8ed0ae0fdabc6902f66;p=python

merge
---

e1d5e543e445de65789be8ed0ae0fdabc6902f66