From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 3 Jan 2012 21:50:16 +0000 (+0100)
Subject: Merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3ac50b778a8068f518804eda0f8966f7cabc1e1;p=python

Merge
---

f3ac50b778a8068f518804eda0f8966f7cabc1e1