Merge branch 'erwan'
authorErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 21:06:18 +0000 (22:06 +0100)
committerErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 21:06:18 +0000 (22:06 +0100)

Trivial merge