merge of 5424fac9de94208647a948e1cf5e2b00fb7dec90
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 18:03:08 +0000 (18:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 18:03:08 +0000 (18:03 +0000)
     and 56608badb3c66e42a7caddfbac78081041eb2557


Trivial merge