Trunk: Merge of r7487, a whitespace cleanup, for thatch
Authored by: ecarter 2008-08-21
Parent: [r7489]
Child: [r7491]