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

Trivial merge