From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 20 Dec 2011 13:00:12 +0000 (+0100)
Subject: Merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1743db5c1066afe1a32c9840aa1f8f376a80ef5a;p=python

Merge
---

1743db5c1066afe1a32c9840aa1f8f376a80ef5a