* merged from bubulle
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 23 Nov 2006 06:14:02 +0000 (07:14 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 23 Nov 2006 06:14:02 +0000 (07:14 +0100)

Trivial merge