nimam
committed
on 22 Nov 06
Reverted all changes from Mannheim