Merge trunk r9297 into the 2.1 branch.

Original public review at:
http://gwt-code-reviews.appspot.com/1099801/show

Patch by: jat
Review by: pdr


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