Patch by Evan.Yan@Sun.COM. r=aaronleventhal. git-svn-id: svn://10.0.0.236/trunk@213687 18797224-902f-48f8-a5cc-f745e15eee43