Integrate r10482 into GWT 2.4 branch. Issue 6628. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.4@10483 8db76d5a-ed1c-0410-87a9-c151d255dfc7