merge of 350db4cf328a0f2550fb4212ab191c0d27f9009b
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 09:41:04 +0000 (09:41 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 09:41:04 +0000 (09:41 +0000)
     and c491123fc7829f3a1f1a3760ec80422581017e3b


Trivial merge