merge from main branch
authorPaul Brossier <piem@piem.org>
Sat, 1 Dec 2007 14:55:36 +0000 (15:55 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 1 Dec 2007 14:55:36 +0000 (15:55 +0100)

Trivial merge