merge from banane
authorPaul Brossier <piem@piem.org>
Tue, 6 Nov 2007 10:53:50 +0000 (11:53 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 6 Nov 2007 10:53:50 +0000 (11:53 +0100)

Trivial merge