Merge remote branch 'hpa/master'
authorErwan Velu <erwan.velu@free.fr>
Fri, 20 Nov 2009 22:14:00 +0000 (23:14 +0100)
committerErwan Velu <erwan.velu@free.fr>
Fri, 20 Nov 2009 22:14:00 +0000 (23:14 +0100)

Trivial merge