merge of 2b6e23ac68e02186b4ddae31bd8871b9569d0b55
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 13:16:55 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 13:16:55 +0000 (13:16 +0000)
     and 3791e4d0585881b1bc482af64573bb6aa552fdd3


Trivial merge