merge from main branch
authorPaul Brossier <piem@piem.org>
Mon, 3 Dec 2007 09:57:52 +0000 (10:57 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 3 Dec 2007 09:57:52 +0000 (10:57 +0100)

Trivial merge