Part 3 of 3 -- Merging reformat branch back to trunk. Includes revisions 12641 and 12642. This is all just manual reformatting and cosmetic changes.
Authored by: dan_w 2010-02-25
Parent: [r12644]
Child: [r12646]