Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 21:44:00 +0000 (22:44 +0100)
committerroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 21:44:00 +0000 (22:44 +0100)

Trivial merge