Testing: merge through [6640] from trunk. All tests pass.
Authored by: ecarter 2008-03-05
Parent: [r6640]
Child: [r6642]