Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 21:18:14 +0000 (23:18 +0200)
committerroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 21:18:14 +0000 (23:18 +0200)

Trivial merge