Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 16 Nov 2011 14:12:17 +0000 (15:12 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 16 Nov 2011 14:12:17 +0000 (15:12 +0100)

Trivial merge