From: Christian Heimes <christian@cheimes.de>
Date: Sun, 30 Sep 2012 13:51:39 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~2443^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c9a5895d4357ad33c42f6d996142ae3fb591ad9;p=python

merge
---

5c9a5895d4357ad33c42f6d996142ae3fb591ad9