I tried to limit the changes to non-formatting ones. I also didn't go as far as http://gwt-code-reviews.appspot.com/1384801 wrt error handling to limit the amount of changes and avoid merge conflicts (or make them easier to resolve).
http://gwt-code-reviews.appspot.com/1380806/ -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
