r=aaronl, sr=jst Check in for Kyle Yuan(kyle.yuan@sun.com)'s fix Check in other files. git-svn-id: svn://10.0.0.236/trunk@121373 18797224-902f-48f8-a5cc-f745e15eee43
r=aaronl, sr=jst Check in for Kyle Yuan(kyle.yuan@sun.com)'s fix Check in other files. git-svn-id: svn://10.0.0.236/trunk@121373 18797224-902f-48f8-a5cc-f745e15eee43