# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1248809272 -7200
# Node ID d72115de4043f8e73acaf17ef7141e5ae20c7820
# Parent  0f26a76b0348a7fc6baf28b43cf6c3c7c65f19a6# Parent  09615ea7533e71d5edbbff1fe04cb794d2d2361b
merge