Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Mon, 15 Nov 2010 22:50:02 +0000 (23:50 +0100)
committerroot <root@blitz.inria.fr>
Mon, 15 Nov 2010 22:50:02 +0000 (23:50 +0100)

Trivial merge