From: Georg Brandl <georg@python.org>
Date: Thu, 23 Feb 2012 20:16:49 +0000 (+0100)
Subject: merge heads
X-Git-Tag: v3.3.0a1~74^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bada35bdf5207fd11065858989e29b8a1591e965;p=python

merge heads
---

bada35bdf5207fd11065858989e29b8a1591e965