merge of 2994aa36c2fc770f17f1156ec1d07bb4890f2c1c
authorRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 19:31:30 +0000 (19:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 19:31:30 +0000 (19:31 +0000)
     and 3d0ac4552983da35d608db55f89a193257e5c32e


Trivial merge