Cherry picking changes from trunk into release branch: 1056801


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