From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 23 Oct 2011 20:47:56 +0000 (+0200)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72ca42af8bfb0c39e40f7f9ee818e286dcc3d422;p=python

Merge heads
---

72ca42af8bfb0c39e40f7f9ee818e286dcc3d422