merge of 0960bd2ad1c045f0f0f29d79ec704ed73cfd5251
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 10:01:42 +0000 (10:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 10:01:42 +0000 (10:01 +0000)
     and 3a790499e1fa803fd61e287cbe663b4036fd1cf0


Trivial merge