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

merge with 3.3
---

b979f1000248fc1079831c5a9d89178a78644d30