merged from debian
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 5 May 2008 09:57:17 +0000 (11:57 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 5 May 2008 09:57:17 +0000 (11:57 +0200)

Trivial merge