Testing: Merge through [6770] from trunk. All tests pass.
Authored by: ecarter 2008-03-29
Parent: [r6770]
Child: [r6772]