merged from donkult
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 20 Oct 2011 09:44:44 +0000 (11:44 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 20 Oct 2011 09:44:44 +0000 (11:44 +0200)

Trivial merge