* merged from Christians tree (thanks!)
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 20 Mar 2006 08:33:37 +0000 (09:33 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 20 Mar 2006 08:33:37 +0000 (09:33 +0100)

Trivial merge