Integrate r11141 into releases/2.5.

Review by: skybrian@google.com

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