lars
committed
on 27 Oct 03
Cleaned up defaulting of variables