merge of 0a670ad135de80006479fae559372bd4a2a6953e
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 21:32:44 +0000 (21:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 21:32:44 +0000 (21:32 +0000)
     and cc24d9073b5cceb01d58ae9f77971c5b4664cdfe


Trivial merge