Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:24:16 +0000 (18:24 +0100)
committerroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:24:16 +0000 (18:24 +0100)

Trivial merge