Merge commit 'origin/trunk@12184' into fedora fedora
authorroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:36 +0000 (06:13 +0100)
committerroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:36 +0000 (06:13 +0100)

Trivial merge