merge of 40541144c923b30f6cbeec9ac83513dbe048d29a
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 18:48:13 +0000 (18:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 18:48:13 +0000 (18:48 +0000)
     and 51a08f420d11f23c3beb1acc0c022582d5306d03


Trivial merge