Testing: Merge through [6754] from trunk. All tests pass.
Authored by: ecarter 2008-03-28
Parent: [r6754]
Child: [r6756]
