# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1272279168 -7200
# Node ID 092bb9355769b499b2466e89a2cd1eafa8f21ac2
# Parent  54791132747510b0c1e18f51efd3f20027ad1bb9# Parent  354cf5ef31dce479d780fe15c7ab2c075e264d68
merge