merge from main branch
authorPaul Brossier <piem@piem.org>
Wed, 21 Nov 2007 15:53:13 +0000 (16:53 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 21 Nov 2007 15:53:13 +0000 (16:53 +0100)

Trivial merge