Merge branch 'master' into exp2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 13:48:54 +0000 (15:48 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 13:48:54 +0000 (15:48 +0200)

Trivial merge