Rolling back changes that broke the continuous build.
$ svn merge -r6024:6018 .


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