merge of 6be0c561dac329e3cd7624dfd7f1133f9af8ae63
authorRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 11:46:14 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 11:46:14 +0000 (11:46 +0000)
     and b138a722ca5b0022bd97e129304ae79ba187c89b


Trivial merge