Testing: Fixup inconsistent newlines in preparation for merge of [6290]
Authored by: ecarter 2008-02-19
Parent: [r6548]
Child: [r6550]