merge of 69397d319e2521a5695b757ce8d4759abc651806
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 22:08:11 +0000 (22:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 22:08:11 +0000 (22:08 +0000)
     and 7a9c6dcd00355e7f104559fd3a74974aad0d5967


Trivial merge