merge of 6f8490048134c6e6b72e44c0685e72338477cc2a
authorRod Whitby <rod@whitby.id.au>
Tue, 15 Aug 2006 06:16:26 +0000 (06:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 15 Aug 2006 06:16:26 +0000 (06:16 +0000)
     and d7c21028acaafe89a817f470db893945ce719268


Trivial merge