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

Merge 3.3.
---

024e286d8faa254e13cca2fd07f8ccb6d2e2212b