Testing: merge through r6000 from trunk. All tests PASS
Authored by: ecarter 2007-09-19
Parent: [r6024]
Child: [r6026]