Testing: Merge through r6014 from trunk; #5022 regression test now passes.
Authored by: ecarter 2007-09-20
Parent: [r6035]
Child: [r6037]