Patch by leon.sha@sun.com. darin: review+ git-svn-id: svn://10.0.0.236/trunk@200670 18797224-902f-48f8-a5cc-f745e15eee43