Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Jul 2012 11:21:37 +0000 (13:21 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Jul 2012 11:21:37 +0000 (13:21 +0200)

Trivial merge