merge of 1010cdd56d6aa7beaa724d0136ed285942b3d461
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 08:01:15 +0000 (08:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 08:01:15 +0000 (08:01 +0000)
     and 158c7012230c89db37efd5ce5fbeffbcc607f6e0


Trivial merge