merge of 12b4667b76c08327e3ca82f9f5c36daaa1be3c4e
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 09:46:02 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 09:46:02 +0000 (09:46 +0000)
     and 4d988d8f1e760a866518bf0804a1ca8c02118b21


Trivial merge