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

Trivial merge