From: Georg Brandl <georg@python.org>
Date: Sun, 14 Apr 2013 09:55:44 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~937
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=015427e6594ed21a6d11f9ee982d16fca9d16c04;p=python

merge with 3.3
---

015427e6594ed21a6d11f9ee982d16fca9d16c04