Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Sat, 26 Mar 2011 13:55:30 +0000 (14:55 +0100)
committerroot <root@blitz.inria.fr>
Sat, 26 Mar 2011 13:55:30 +0000 (14:55 +0100)

Trivial merge