donb
committed
on 27 Feb 05
Somehow I managed to goober the last commit, despite having (I thought)
properly resolved merge conflicts. Oh well ...