* merged from bubulle
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 30 Oct 2006 09:51:08 +0000 (10:51 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 30 Oct 2006 09:51:08 +0000 (10:51 +0100)

Trivial merge