gustafn
committed
on 15 May 07
making interfaces and naming more consistent