Merging from the 2.1 I/O branch through r7982. Review by: mmendez@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8219 8db76d5a-ed1c-0410-87a9-c151d255dfc7