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