merge of 45b9c31faf5ea0a1f222543e7f19d257ab139bb5
authorRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 20:18:09 +0000 (20:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 20:18:09 +0000 (20:18 +0000)
     and f5bdc770e5f516fdff72ea09c66df9591451f294


Trivial merge