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

Trivial merge