merge from bastille
authorPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 15:53:29 +0000 (16:53 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 15:53:29 +0000 (16:53 +0100)

Trivial merge