Bookkeeping of 3 cherrypick merges and one reverse merge.  If need be, I
volunteer to sort out the next one since there's now at least 4 
fragments...



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