From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 16 Jan 2013 14:19:16 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2515e4997773aa42a9d6dd60d9b5e4c6e89384e;p=python

Merge 3.3.
---

e2515e4997773aa42a9d6dd60d9b5e4c6e89384e