# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242298271 -7200
# Node ID 0c7b091215077dd2299db9f6beff59fddf8f2150
# Parent  4e4333bb56b3a60cc6a23cf2ddefd313a4cda321# Parent  2ef282c7f2a812c505c49cf132ed9bf89bdcc83d
merge