# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242298313 -7200
# Node ID d0173f4eb6471eb89fb9340cd653a398d12ac7bf
# Parent  0c7b091215077dd2299db9f6beff59fddf8f2150# Parent  c258394c01483d7fd0e92a3c5c6f5db91ed8550f
merge