# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242298234 -7200
# Node ID 4e4333bb56b3a60cc6a23cf2ddefd313a4cda321
# Parent  e95e876be17ceb64d9cdafb75cd6a13d25952f36# Parent  4307a461f0293c16e4e6cc8c7d24d8a97a918a20
merge