merge of '2fb021b9821c36a4c1cbd5a8f6f8587212618043'
authorRod Whitby <rod@whitby.id.au>
Sun, 5 Nov 2006 09:48:50 +0000 (09:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 5 Nov 2006 09:48:50 +0000 (09:48 +0000)
     and 'b2778861a51174fffe28fe33526d2ac123442b0e'


Trivial merge