merge of 471aad48b7c9a627b8076ae84d8c14cdd7fcc175
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 09:01:27 +0000 (09:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 09:01:27 +0000 (09:01 +0000)
     and 68d89a8d9ec1d1dadd54f2a464845b5134d27796


Trivial merge