# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1381310036 -7200
# Node ID 614762cdc35719f82756f77827eb7b229fa151e6
# Parent  1dfe62a9da50dcf0f3ef4855fb59ae57acf39a4a# Parent  593b29325f6870e35a1f39eb82e221ed0e22d198
merge two default heads