merge of aee71aa12ddd8a9c11877e0e923b6a75dfa6d3b3
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 18:32:36 +0000 (18:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 18:32:36 +0000 (18:32 +0000)
     and e7fbbc264909eb5de1d36e4e5772f119791cd74a


Trivial merge