merged from donkult
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 27 Jul 2009 07:50:32 +0000 (09:50 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 27 Jul 2009 07:50:32 +0000 (09:50 +0200)

Trivial merge