merge from Amaury's changes
authorPaul Brossier <piem@piem.org>
Sat, 8 Sep 2007 11:52:48 +0000 (13:52 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 8 Sep 2007 11:52:48 +0000 (13:52 +0200)

Trivial merge