# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1348175699 -7200
# Node ID 5a0a01c4c7c2260d3f1328bab3adf792b7805f04
# Parent  53d7e34133377bceade8815d081ee511a28a210e# Parent  dc107acd0bd294d57f10b4b6baca55715b4cee9b
merge stable into default