merge of 06d7a9b5635f914bdc4200f0f4f62459081f13db
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 19:25:01 +0000 (19:25 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 19:25:01 +0000 (19:25 +0000)
     and 10926eec6b5cb3adcd7df2208e2378bd1fc98cbd


Trivial merge