merge of 98e0cf8d3e683fd10afcf14894a3058c23e2b5f0
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 16:47:23 +0000 (16:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 16:47:23 +0000 (16:47 +0000)
     and ce67547384f217f30ce45422ea9293803aa35f00


Trivial merge