Testing: Merge through r6021 from trunk. The #6048 regression test PASSES.
Authored by: ecarter 2007-09-21
Parent: [r6039]
Child: [r6041]