Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 15:12:14 +0000 (17:12 +0200)
committerroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 15:12:14 +0000 (17:12 +0200)

Trivial merge