merged from donkult
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 21 Jul 2009 18:14:15 +0000 (20:14 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 21 Jul 2009 18:14:15 +0000 (20:14 +0200)

Trivial merge