From: Christian Heimes <christian@cheimes.de>
Date: Mon, 21 Oct 2013 09:59:34 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0b1~571^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ac1eb16d5c4b779da38895597ee5d7caf3d22bd;p=python

merge
---

3ac1eb16d5c4b779da38895597ee5d7caf3d22bd