merge main branch
authorPaul Brossier <piem@piem.org>
Fri, 2 Nov 2007 11:25:42 +0000 (12:25 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 2 Nov 2007 11:25:42 +0000 (12:25 +0100)

Trivial merge