From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 18 Nov 2012 23:57:20 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~1975
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8473e5740ffe15134a73f1553b5980de4ce2c619;p=python

Merge.
---

8473e5740ffe15134a73f1553b5980de4ce2c619