merge of 315f8d949ff4e2e3c22ae6f04a8b05818b5a7403
authorRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 07:02:02 +0000 (07:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 07:02:02 +0000 (07:02 +0000)
     and 73083df25ef04912a19b6b56f5510de14442ab2d


Trivial merge