merge of 5de14a26c9fe526edc43ef8c1b0610c5ce6b2080
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 01:02:52 +0000 (01:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 01:02:52 +0000 (01:02 +0000)
     and 6d86cc1120eb58d3d78c4eeb331067a977f09459


Trivial merge