Merge commit 'origin/erwan'
authorErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 22:38:29 +0000 (23:38 +0100)
committerErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 22:38:29 +0000 (23:38 +0100)

Trivial merge