merge from main branch
authorPaul Brossier <piem@piem.org>
Tue, 4 Dec 2007 16:52:27 +0000 (17:52 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 4 Dec 2007 16:52:27 +0000 (17:52 +0100)

Trivial merge