merge of 2eb3e554331d55cc0f7d813dca896a891a88eead
authorRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 11:48:07 +0000 (11:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 11:48:07 +0000 (11:48 +0000)
     and a94af4911a294bcdb04e177bd028dd19a7a36edb


Trivial merge