Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Tue, 18 Jan 2011 21:51:16 +0000 (22:51 +0100)
committerroot <root@blitz.inria.fr>
Tue, 18 Jan 2011 21:51:16 +0000 (22:51 +0100)

Trivial merge