# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359806821 -3600
# Node ID ddb7013da614dde7824c21b9274c53244ffd88c1
# Parent  c5a5e9f2c959176a1cde9210e41fef1b2656d6e4# Parent  3ce69678a47e32a19e0e6273731aefbbe9d17dc1
merge with doc fixes