merge of 00a1173f52521e355938ea94e53256590de6c4c5
authorRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 06:40:23 +0000 (06:40 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 06:40:23 +0000 (06:40 +0000)
     and 370dc8d1e7ae56009af3c2640733f1c5ea39523d


Trivial merge