Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Tue, 8 Mar 2011 22:33:15 +0000 (23:33 +0100)
committerroot <root@blitz.inria.fr>
Tue, 8 Mar 2011 22:33:15 +0000 (23:33 +0100)

Trivial merge