merged from the mvo branch
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 19 Aug 2009 09:28:34 +0000 (11:28 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 19 Aug 2009 09:28:34 +0000 (11:28 +0200)

Trivial merge