From: Éric Araujo <merwok@netwok.org>
Date: Fri, 17 Feb 2012 17:10:11 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16;p=python

Branch merge
---

f1fd388c775acee4d1e5f560b3ae9dfb9ad7cd16