merge from rhubarb
authorPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 16:21:00 +0000 (17:21 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 16:21:00 +0000 (17:21 +0100)

Trivial merge