Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 15:26:06 +0000 (17:26 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 15:26:06 +0000 (17:26 +0200)

Trivial merge