Update.

svn path=/branches/BRANCH_6-3/; revision=4972