From: Éric Araujo <merwok@netwok.org>
Date: Fri, 29 Jul 2011 12:23:13 +0000 (+0200)
Subject: Branch merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fea8ac47725f7152dc1abac5f40c1ece46fd8975;p=python

Branch merge
---

fea8ac47725f7152dc1abac5f40c1ece46fd8975