merge of 36d801d604bcf18d92151a23095caa49c3c0e07c
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 19:03:15 +0000 (19:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Sep 2006 19:03:15 +0000 (19:03 +0000)
     and 5973cff7074d3746ce1b548caf58e7dd6aae2826


Trivial merge