From: Georg Brandl <georg@python.org>
Date: Sun, 14 Apr 2013 08:31:24 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~944
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9def20566a81f2ef8ea0e86a77883a135ef28f80;p=python

merge with 3.3
---

9def20566a81f2ef8ea0e86a77883a135ef28f80