daveb
committed
on 25 Aug 08
Merging from release branch to HEAD