Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 26 Oct 2011 09:29:39 +0000 (11:29 +0200)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 26 Oct 2011 09:29:39 +0000 (11:29 +0200)

Trivial merge