patch from ervin.yan@sun.com r=ftang,sr=rbs,a=sspitzer git-svn-id: svn://10.0.0.236/trunk@142051 18797224-902f-48f8-a5cc-f745e15eee43
patch from ervin.yan@sun.com r=ftang,sr=rbs,a=sspitzer git-svn-id: svn://10.0.0.236/trunk@142051 18797224-902f-48f8-a5cc-f745e15eee43