Merges r7505 from trunk into releases/2.0

svn merge -c7505 --ignore-ancestry https://google-web-toolkit.googlecode.com/svn/trunk



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