Patch by alfred.peng@sun.com. neil: review+ bzbarsky: superreview+ git-svn-id: svn://10.0.0.236/trunk@198370 18797224-902f-48f8-a5cc-f745e15eee43
Patch by alfred.peng@sun.com. neil: review+ bzbarsky: superreview+ git-svn-id: svn://10.0.0.236/trunk@198370 18797224-902f-48f8-a5cc-f745e15eee43