merge of 101cc837c8a2d1c2d4abc0f9ed9415554cbb609c
authorRod Whitby <rod@whitby.id.au>
Sun, 26 Nov 2006 13:47:35 +0000 (13:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 26 Nov 2006 13:47:35 +0000 (13:47 +0000)
     and 95d8882549c61d28fd1ccd1223c761df50dfcebb


Trivial merge