From: Éric Araujo <merwok@netwok.org>
Date: Thu, 9 Jun 2011 11:14:12 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~695^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d476a89e46df570ff009d18062b0a4d9339f5a25;p=python

Branch merge
---

d476a89e46df570ff009d18062b0a4d9339f5a25