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