merge of 3452833ceea3f4c187f20fb7092b4eed7c1eaa62
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 13:17:25 +0000 (13:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 13:17:25 +0000 (13:17 +0000)
     and dfd3feed8f6beca9701b31e0b54d7cde979f133b


Trivial merge