merge of 97d7597b72ca17c3f3ec8649b748ce205e184423
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:46:57 +0000 (20:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:46:57 +0000 (20:46 +0000)
     and 8eb6b233aceb83e6c40ddd88e0b223a6c8eb85ab


Trivial merge