From: Georg Brandl <georg@python.org>
Date: Mon, 1 Oct 2012 16:57:34 +0000 (+0200)
Subject: null-merge with 3.3
X-Git-Tag: v3.4.0a1~2425
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a0f8c02d3df59a6e3f87e8da309ae6488995983;p=python

null-merge with 3.3
---

0a0f8c02d3df59a6e3f87e8da309ae6488995983