Merge remote-tracking branch 'local_master/master'
authorroot <root@devel.pl.sophia.inria.fr>
Wed, 18 Jul 2012 14:22:26 +0000 (16:22 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Wed, 18 Jul 2012 14:22:26 +0000 (16:22 +0200)

Trivial merge