From: Georg Brandl <georg@python.org>
Date: Wed, 10 Oct 2012 14:49:18 +0000 (+0200)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2287^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42ac3c91e75fc3b44c3d5e3ab30db6d022f3f749;p=python

merge 3.3
---

42ac3c91e75fc3b44c3d5e3ab30db6d022f3f749