From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 4 Jan 2014 10:21:15 +0000 (+0100)
Subject: Merge 3.3
X-Git-Tag: v3.4.0b2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd3c36d1252b92b8c85e70bda385db58f0939aef;p=python

Merge 3.3
---

dd3c36d1252b92b8c85e70bda385db58f0939aef