From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 May 2011 05:42:48 +0000 (+0200)
Subject: merged
X-Git-Tag: v3.3.0a1~2348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75813105a2cb35ce4486038dd9bb7ae07e2a2c72;p=python

merged
---

75813105a2cb35ce4486038dd9bb7ae07e2a2c72