maltes
committed
on 17 Feb 06
Added changes from Heidelberg