merge of 21cf340af525f9fc4a8b71b5ad326f7041619722
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 21:01:22 +0000 (21:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 21:01:22 +0000 (21:01 +0000)
     and 3ba5f8db83f0545a2d2eb7c22fea2b9a7e8b8213


Trivial merge