Cherrypick r11508 into 2.5 release branch.



git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11509 8db76d5a-ed1c-0410-87a9-c151d255dfc7
2 files changed