donb
committed
on 19 Jul 07
Copied over a few more things from default master...