From: Éric Araujo <merwok@netwok.org>
Date: Wed, 25 May 2011 16:06:35 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.2rc1~6^2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78d9133989c26c8539c51acfbc98aff416a701cd;p=python

Branch merge
---

78d9133989c26c8539c51acfbc98aff416a701cd