fix whitespace from my mistake when merging

If you don't want to read all the boring details of this review, just download the change and run "git show -w" to show you that it's just whitespace changes, and run "ant checkstyle" to show that it solves the checkstyle issues in the branch.