# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1242045986 -7200
# Node ID 296f0eda7f67412aff4e38660fe502ad63557feb
# Parent  19e3cfc065c2f6855867e99b8b16ccba1c327c17# Parent  d15406d17803b93ed149490aa080af50cbf3cb75
merge