merge of bf957aad8fed0ec82ba06498cfb76ff6829daee8
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 00:16:36 +0000 (00:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 00:16:36 +0000 (00:16 +0000)
     and d44dc9ee0efde08485ad2777d9b525e078d88acc


Trivial merge