Merge remote-tracking branch 'origin/geni-v3' into geni-v3
authorroot <root@devel.pl.sophia.inria.fr>
Mon, 20 Aug 2012 18:49:25 +0000 (20:49 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Mon, 20 Aug 2012 18:49:25 +0000 (20:49 +0200)

Trivial merge