merge of 6bfd9403f72a27b0681b16fca8d367883c564eb4
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 12:16:43 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 12:16:43 +0000 (12:16 +0000)
     and 8da25be9d5f9817c31c2411800229cd33b9dc184


Trivial merge