merge with main branch
authorPaul Brossier <piem@piem.org>
Thu, 29 Nov 2007 16:34:18 +0000 (17:34 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 29 Nov 2007 16:34:18 +0000 (17:34 +0100)

Trivial merge