From: Christian Heimes <christian@cheimes.de>
Date: Sun, 14 Oct 2012 00:53:40 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~2258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d376986014ab76dfa78916a933bd45098c0bd7c6;p=python

merge
---

d376986014ab76dfa78916a933bd45098c0bd7c6