From: Christian Heimes <christian@cheimes.de>
Date: Mon, 22 Jul 2013 08:37:41 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~109^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37c916dd18df3442a4d8f79d14f5f23ba87e3fe5;p=python

merge
---

37c916dd18df3442a4d8f79d14f5f23ba87e3fe5