Testing: Merge through [6306] (excluding [6120] and [6122]) from trunk. All tests pass.
Authored by: ecarter 2008-02-19
Parent: [r6551]
Child: [r6553]