Testing: Merge [6120] and [6122] from trunk. All tests pass.
Authored by: ecarter 2008-02-20
Parent: [r6559]
Child: [r6561]