# HG changeset patch
# User Laurent Bessard
# Date 1378680514 -7200
# Node ID 26e8b99bc2c3d1dbc07dfd769969333eb4bbfe5d
# Parent  1d221eda1e42c88fbeff747cbcdf959f0845d10a# Parent  1ff1cdf6c3183d52b631c4bcd13f61b50cfee1c4
Merged