andrewg
committed
on 08 Mar 05
Bringing in fixes from HEAD