Testing: Merge through r5885 from trunk; all tests PASS
Authored by: ecarter 2007-07-31
Parent: [r5885]
Child: [r5887]