merge of 0aec702b25b2fc86eeb069514171974937129625
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 11:46:10 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 11:46:10 +0000 (11:46 +0000)
     and 55b5ccb5821ec4c7d05e3dd27ba81c62897d511a


Trivial merge