# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359806527 -3600
# Node ID c5a5e9f2c959176a1cde9210e41fef1b2656d6e4
# Parent  e6e47c432ffd7cfbec22bdd57925e82a84d2ce08# Parent  ae99c0f06fcbf7297c33e873956fd8c556421a69
merge with stable