Patch by leon.zhang@sun.com r=Henry, sr=alecf git-svn-id: svn://10.0.0.236/trunk@127594 18797224-902f-48f8-a5cc-f745e15eee43