merge of 4f9848c48a54fcfa48455fefb11c392a01772332
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 19:31:47 +0000 (19:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 19:31:47 +0000 (19:31 +0000)
     and 76f1fdf6dff425bfdddcd67c4430bf4bc23ab36c


Trivial merge