merge of 07a532c4c6145b3a9cd266e7e2a1627fdace31f5
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 06:47:01 +0000 (06:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 06:47:01 +0000 (06:47 +0000)
     and f14146eea70011b4bb6773d8401d0068d551f29d


Trivial merge