From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 26 Jun 2012 07:19:48 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4b018f0cd9c1b84f4c6bf3b3dc893237c46df94;p=python

Merge
---

a4b018f0cd9c1b84f4c6bf3b3dc893237c46df94