Testing: Merge through [6704] from trunk. All tests pass.
Authored by: ecarter 2008-03-17
Parent: [r6704]
Child: [r6706]