gustafn
committed
on 25 May 07
fixing potential name clash