Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:58:52 +0000 (21:58 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:58:52 +0000 (21:58 +0100)

Trivial merge