merge of 0ee8224b8b54771764675f2d2fb9f0b0c5de3b0e
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 23:02:09 +0000 (23:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 23:02:09 +0000 (23:02 +0000)
     and b44eadcf7c10c71ba85ff83fbcd95d9ee3d3852b


Trivial merge