Testing: Merge through [6746] from trunk. All tests pass.
Authored by: ecarter 2008-03-24
Parent: [r6746]
Child: [r6748]