From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 24 Jan 2013 14:37:37 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1544^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82c6029832dc4f7669b12dc1e32e5166e32260dc;p=python

Merge 3.3.
---

82c6029832dc4f7669b12dc1e32e5166e32260dc