merge of 6e6bbf559d74bca5da6958e8eca66e94b5d8248b
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 09:07:35 +0000 (09:07 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 09:07:35 +0000 (09:07 +0000)
     and 873e9c1c022896459e35caf07ff1569d30bcead0


Trivial merge