Testing: merge through r5949 from trunk
Authored by: ecarter 2007-08-22
Parent: [r5951]
Child: [r5953]