merge of 5d227caceeb62ba64050a701f15f08f65bd5f723
authorRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 13:48:07 +0000 (13:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 4 Sep 2006 13:48:07 +0000 (13:48 +0000)
     and 7ecc11dbf2cc1308396b89a4fdb083478bf63388


Trivial merge