merge of 7fa3dab3598663b11853245b23ba6f7951b5199f
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 10:02:27 +0000 (10:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 10:02:27 +0000 (10:02 +0000)
     and e92a3c580b84606dead770a2412d8bb416f52870


Trivial merge