Testing: Merge through [6678] from trunk. All tests pass
Authored by: ecarter 2008-03-11
Parent: [r6678]
Child: [r6680]