merge of f047496cd5580e26d7406d71984e4fa97506c22e
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 11:01:24 +0000 (11:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 11:01:24 +0000 (11:01 +0000)
     and f31eab98f422e94d72f0504777aadcd812edb52a


Trivial merge