Testing: merge through r6009 from trunk
Authored by: ecarter 2007-09-20
Parent: [r6029]
Child: [r6031]