Fix inadvertent commit by mixing changes in one workspace.

Patch by: jat
Review by: conroy


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