merge svn(changeset 51513) to slp : remove whitespaces