gustafn
committed
on 02 Feb 07
merged daves changes from 5-3, eliminated dead code