Testing: Merge through [6581] (excluding [6538]) from trunk. All tests pass.
Authored by: ecarter 2008-02-21
Parent: [r6587]
Child: [r6589]