From: Christian Heimes <christian@cheimes.de>
Date: Sat, 6 Oct 2012 15:14:02 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~2341
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3df2060a60a7ec349ad12f43a0dcb34d7fedcb4;p=python

merge
---

d3df2060a60a7ec349ad12f43a0dcb34d7fedcb4