Testing: Merge [5823] from trunk; this eliminates the #5687 regression failure.
Authored by: ecarter 2007-07-11
Parent: [r5826]
Child: [r5828]