Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Mon, 7 Nov 2011 07:51:38 +0000 (08:51 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Mon, 7 Nov 2011 07:51:38 +0000 (08:51 +0100)

Trivial merge