merge of 2375309a9ca5f8ab5d909f29faeaca5d1c2dd528
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 10:31:52 +0000 (10:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 10:31:52 +0000 (10:31 +0000)
     and 5941ccc605ab8f526298799aa8921316e82809c4


Trivial merge