merge from main branch
authorPaul Brossier <piem@piem.org>
Wed, 5 Dec 2007 02:42:07 +0000 (03:42 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 5 Dec 2007 02:42:07 +0000 (03:42 +0100)

Trivial merge