merge of 6b7f9cf3f65ad039a833daa763ba3ce580f1bda3
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 00:03:08 +0000 (00:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 00:03:08 +0000 (00:03 +0000)
     and c465aa2afe45bc4074882eea0d2ce1b9369b5707


Trivial merge