Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 13:03:08 +0000 (14:03 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 13:03:08 +0000 (14:03 +0100)

Trivial merge