daveb
committed
on 07 Jun 06
Fix conflicts leftover from last commit.