Mingfai - 2010-09-08

diff against the svn trunk