patch by antonio.xu@sun.com r=dbaron sr=waterson git-svn-id: svn://10.0.0.236/trunk@123751 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@110570 18797224-902f-48f8-a5cc-f745e15eee43