merge of 379e31e32bb43c6e86d417f97cb19d13cfb16b6a
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 19:03:24 +0000 (19:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 19:03:24 +0000 (19:03 +0000)
     and 9c307d34e162395d96ddb6e808059ea8c3361f74


Trivial merge