merge from pomme branch
authorPaul Brossier <piem@piem.org>
Wed, 18 Apr 2007 09:38:26 +0000 (11:38 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 18 Apr 2007 09:38:26 +0000 (11:38 +0200)

Trivial merge