Testing: merge r5963 from trunk; the #5930 regression test still fails.
Authored by: ecarter 2007-08-27
Parent: [r5973]
Child: [r5975]