merge of 361f5e7496f085af56d5712f1b0cfa108c430f27
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 23:02:37 +0000 (23:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 23:02:37 +0000 (23:02 +0000)
     and cba9424aaaa4dec6ea669f58419f83cf995bd057


Trivial merge