Cherrypick r11544 into 2.5 release branch.


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