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

Trivial merge