Merge commit 'hpa/master'
authorErwan Velu <erwan.velu@free.fr>
Mon, 19 Oct 2009 13:26:20 +0000 (15:26 +0200)
committerErwan Velu <erwan.velu@free.fr>
Mon, 19 Oct 2009 13:26:20 +0000 (15:26 +0200)

Trivial merge