# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1206908635 -7200
# Node ID 9d2983c6a965f95010d8c5a25951861b2d068609
# Parent  644a56c7ae79b114f09fbd79b48822e328bd1db9# Parent  34c51857ba4fc90efe679b7f2cd562715040add6
merge with -stable