merge from main branch
authorPaul Brossier <piem@piem.org>
Fri, 30 Nov 2007 09:00:10 +0000 (10:00 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 30 Nov 2007 09:00:10 +0000 (10:00 +0100)

Trivial merge