From: Martin v. Loewis <martin@v.loewis.de>
Date: Sun, 24 Mar 2013 21:12:19 +0000 (+0100)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1095
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e81b3e6556fa853a0b59802282dfbba43431400;p=python

merge 3.3
---

1e81b3e6556fa853a0b59802282dfbba43431400