merge of 04a614aaf2494f9969f8d456330c108c6cce3b2b
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 00:04:58 +0000 (00:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 00:04:58 +0000 (00:04 +0000)
     and 0f6969d4ead4e00cd7af790f83f9ae1860433891


Trivial merge