merge of a37386c647ba514be2ca59ef5c79c6a6a410c1ac
authorRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 11:46:16 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 11:46:16 +0000 (11:46 +0000)
     and f876e12a0a86569a88b52f784afdf938aae16b25


Trivial merge