daveb
committed
on 17 Nov 03
Merging bug fix from HEAD. Fixes bug#1163 and bug#1153.