# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1234966648 -3600
# Node ID b2f962292dbfcc2f1d0f96577ab5ec7b28e95161
# Parent  06b05dce483165620ed9dfebfb3bf9268587d717# Parent  f476dad65ab2962b00118ea32321e3bf70f65752
merge