Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 06:49:54 +0000 (08:49 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 06:49:54 +0000 (08:49 +0200)

Trivial merge