* merged from ian
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 14 Dec 2006 10:50:19 +0000 (11:50 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 14 Dec 2006 10:50:19 +0000 (11:50 +0100)

Trivial merge