Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 26 Oct 2010 20:50:05 +0000 (22:50 +0200)
committerroot <root@blitz.inria.fr>
Tue, 26 Oct 2010 20:50:05 +0000 (22:50 +0200)

Trivial merge