merge of 60762442fc41883c42e53594dcf5674ab0eaaf7c
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 15:17:50 +0000 (15:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 15:17:50 +0000 (15:17 +0000)
     and 7ab404ab2173ae6f075b0f3345558a26d9bf9ef1


Trivial merge