Merge from 1.6 to trunk.

svn merge -r4911:4962 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
svn merge -r4963:4992 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .



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