Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 18:30:59 +0000 (19:30 +0100)
committerroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 18:30:59 +0000 (19:30 +0100)

Trivial merge