From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 22 Jun 2012 20:19:51 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.0b1~154^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebd1b1dcb7a944ace00fd4f6565b5a2627eab2ce;p=python

Merge heads
---

ebd1b1dcb7a944ace00fd4f6565b5a2627eab2ce