Merge "Formatting rules specific to Eclipse 3.5."