# HG changeset patch
# User jodogne
# Date 1351000899 -7200
# Node ID a660e18b2360cdc7301ca2f575b70877a7b42f8a
# Parent  5b6b5c9f280fd4e324dc75967c5a8b9cca7d8a27# Parent  93e1b0e3b83a75b7e4ccb4cbfefd3cdfe5b9d785
merge