merge of b09ecf88cecf70707dc0a096faf705b794d4f51d
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 11:31:08 +0000 (11:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 11:31:08 +0000 (11:31 +0000)
     and f2c0bb6be43c4e77d83323d4acb783c27af97723


Trivial merge