From: Georg Brandl <georg@python.org>
Date: Sun, 6 Mar 2011 09:36:06 +0000 (+0100)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2983
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a1acf2e34dc109a2b01f172b05475caea32e060;p=python

merge heads
---

8a1acf2e34dc109a2b01f172b05475caea32e060