merge of 2c2ea5202f246c99eafb813472c792847ab72e20
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 17:16:05 +0000 (17:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 17:16:05 +0000 (17:16 +0000)
     and d4cbbf77b281e4aa72713115f1215cfcec838fe8


Trivial merge