From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 5 Mar 2012 09:50:11 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a2~276^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49ab14f4529e06ecd7d6804ea80f62ab6094a386;p=python

Merge.
---

49ab14f4529e06ecd7d6804ea80f62ab6094a386