From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 30 Oct 2011 19:25:29 +0000 (+0100)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b6403e5d14a407acb744cd1da58d1a66c412050;p=python

Merge heads
---

2b6403e5d14a407acb744cd1da58d1a66c412050