From: Éric Araujo <merwok@netwok.org>
Date: Sun, 24 Jun 2012 17:54:22 +0000 (-0400)
Subject: Branch merge
X-Git-Tag: v3.3.0b1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56261cff162dee2043b859986a6a73db52d27085;p=python

Branch merge
---

56261cff162dee2043b859986a6a73db52d27085