# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1242052122 -7200
# Node ID ee3ca4745fc30b9a9bc85deeb2a14f8e61961d07
# Parent  296f0eda7f67412aff4e38660fe502ad63557feb# Parent  08918409815e5c35e0afe0b3f101191a313ed15b
merge