Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 12 Dec 2011 13:29:37 +0000 (14:29 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 12 Dec 2011 13:29:37 +0000 (14:29 +0100)

Trivial merge