merge of 6ebc553aa18b25012439c54d7496c157bbabcdb9
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 07:01:24 +0000 (07:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 07:01:24 +0000 (07:01 +0000)
     and c9c7d03b18f7b587283496fabe8e839a255ff676


Trivial merge