merge of 4c416c31ac1dee91ca836f2dee1069b2b0a55035
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 09:31:20 +0000 (09:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 09:31:20 +0000 (09:31 +0000)
     and 6f5961443b32f9a8e798dd9a5f5042bda9f0351d


Trivial merge