merge of 2bf0c3bc82f1c3fd73dd5794a80a4dfbf25d9ac3
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:47:01 +0000 (20:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 20:47:01 +0000 (20:47 +0000)
     and c6503f659bf477fbd684cf50b9a73db2e7af3bbc


Trivial merge