From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 17 Jan 2013 19:44:02 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cc36bc6a4812f6954535743388713fb5554e6ae;p=python

Merge 3.3.
---

5cc36bc6a4812f6954535743388713fb5554e6ae