merge of 5c42f9ce62648e7c8f6308ada5e7d7d7eb900b36
authorRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 17:46:23 +0000 (17:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 6 Sep 2006 17:46:23 +0000 (17:46 +0000)
     and 732243cdb95b781f5f8d025c92abbf0ef74ef436


Trivial merge