From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 7 Apr 2012 14:10:04 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a3~294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bcb138cf2253f67c5e355af2eefd8f721b03f25;p=python

Merge.
---

1bcb138cf2253f67c5e355af2eefd8f721b03f25