patch by tiger.zhang @sun.com r+sr=mscott git-svn-id: svn://10.0.0.236/trunk@227103 18797224-902f-48f8-a5cc-f745e15eee43