merge of 99ee044261525e1f0b08f49f73d9a39028c8dcc7
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 08:17:01 +0000 (08:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 08:17:01 +0000 (08:17 +0000)
     and ddc1435bf9be5344c25c778b1bc2d6af4d04448b


Trivial merge