From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 25 Sep 2012 15:10:02 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.1rc1~818^2^2~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee830e06ff09c281c5bb78d3744e95dfb2c6ce6c;p=python

Merge.
---

ee830e06ff09c281c5bb78d3744e95dfb2c6ce6c