merge of 30c7d503e09d4d7b23e4ea8ed438f7acdbbc307e
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 04:31:50 +0000 (04:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 04:31:50 +0000 (04:31 +0000)
     and 41e48b263a156b6efa6eec3dd322d7b01f6dd8b2


Trivial merge