Testing: merge through r6103, all tests pass
Authored by: ecarter 2008-01-25
Parent: [r6405]
Child: [r6407]