merge of 73cf0a318b1b84e8654ced45a301d96cd45db206
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 18:01:05 +0000 (18:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 18:01:05 +0000 (18:01 +0000)
     and 913ca757b0ffc1900151c599e92abad2579ceaf6


Trivial merge