Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <nturro@sfa.grenoble.senslab.info>
Thu, 20 Oct 2011 15:19:31 +0000 (17:19 +0200)
committerNicolas Turro <nturro@sfa.grenoble.senslab.info>
Thu, 20 Oct 2011 15:19:31 +0000 (17:19 +0200)

Trivial merge