# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1347781681 -7200
# Node ID 9193041c8018b8cb63088f0f770955fa6f1e3c8d
# Parent  601ee9b7f2c72dcd849fc0189b8d54523d43ca78# Parent  e9e3c9e6a55562aba6f7d4d93f6427e90cafcad4
merge