# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1244051213 -7200
# Node ID 20a4739ea3002eaf196f17d08408e0292a4dd275
# Parent  85eae6a79f75c8b6bd728d695584f2daa6a95762# Parent  b2b787595c5c8f17ccf07c2cebb805c9333988d1
merging branches to close them.