# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242298347 -7200
# Node ID 1c0d83acb340c9799cabba9acc6629ffa7587314
# Parent  d0173f4eb6471eb89fb9340cd653a398d12ac7bf# Parent  8823d039ad4f35a38db5e189640d295da5de739c
merge