Merge remote-tracking branch 'origin/geni-v3' into geni-v3
authorroot <root@devel.pl.sophia.inria.fr>
Fri, 24 Aug 2012 14:19:23 +0000 (16:19 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Fri, 24 Aug 2012 14:19:23 +0000 (16:19 +0200)

Trivial merge