merge with -stable
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 30 Mar 2008 22:23:55 +0200
changeset 6412 9d2983c6a965
parent 6410 644a56c7ae79 (current diff)
parent 6411 34c51857ba4f (diff)
child 6413 407dcc0c1429
merge with -stable