Testing: merge through r5840 from trunk
Authored by: ecarter 2007-07-16
Parent: [r5840]
Child: [r5842]