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

merge 3.3
---

ecb02d62e0f1dcc12e2f12caecf9b2a21648af86