merge from banane
authorPaul Brossier <piem@piem.org>
Sat, 3 Nov 2007 18:12:13 +0000 (19:12 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 3 Nov 2007 18:12:13 +0000 (19:12 +0100)

Trivial merge