cherry picking r9861 into release/2.3m1


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