Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Sun, 31 Oct 2010 23:08:01 +0000 (00:08 +0100)
committerroot <root@blitz.inria.fr>
Sun, 31 Oct 2010 23:08:01 +0000 (00:08 +0100)

Trivial merge