gustafn
committed
on 25 Mar 07
fixing name ambiguity