merge from amaury's branch
authorPaul Brossier <piem@piem.org>
Sun, 16 Sep 2007 16:06:07 +0000 (18:06 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 16 Sep 2007 16:06:07 +0000 (18:06 +0200)

Trivial merge