From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 Jul 2012 18:51:45 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.0b2~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7439a547b5d21bb32693eece2a8307d6221282e;p=python

merge heads
---

b7439a547b5d21bb32693eece2a8307d6221282e