Testing: merge through r5999 from trunk
Authored by: ecarter 2007-09-19
Parent: [r6022]
Child: [r6024]