merge of 48674f7dd589caad0d094f9897c833d3abe7b945
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 11:31:37 +0000 (11:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 11:31:37 +0000 (11:31 +0000)
     and ec6d6f07258675264c7e5bfb16e8d76d5f9373a5


Trivial merge