merge of baf16ab89a58be4c5de2ade0680a662a6783bb5f
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 11:01:11 +0000 (11:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 11:01:11 +0000 (11:01 +0000)
     and bf5934d4d03576ba9e74f579156f8369ae99c483


Trivial merge