Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Wed, 8 Dec 2010 15:40:26 +0000 (16:40 +0100)
committerroot <root@blitz.inria.fr>
Wed, 8 Dec 2010 15:40:26 +0000 (16:40 +0100)

Trivial merge