[AMOS commit] MDL-20636 Fix some minor editing problems, and a bunch of coding style. Committed into Git: 2011-03-29 10:08 UTC