# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242298144 -7200
# Node ID e95e876be17ceb64d9cdafb75cd6a13d25952f36
# Parent  aa09e20dd8c02f3a22c72561cf800bf4474eaa95# Parent  fb8c39cf084900b49e6e89dfba545c6f54d21a72
merge