jeffd
committed
on 12 Mar 04
Remerge Timo's changes for tip 42,43, cf tip 53