# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1265984280 -3600
# Node ID c25da7573ebd19bafaed771c0ea597a5a35eaddb
# Parent  7e781ff7872664191a4b4e5d45233ef30fb6683e# Parent  029e08b1723f569c5c5dfc322bf7e4af34907dc8
merge