maltes
committed
on 04 May 05
Fixing leftovers from merge