merge of 0b9843fe49375cf4e7b44a9e59f58b3108c0de71
authorRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 21:31:38 +0000 (21:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 21:31:38 +0000 (21:31 +0000)
     and 5756a6b9cb1b3b1f654345f7e17ab30f3a48613e


Trivial merge