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

Trivial merge