Testing: merged through r6011 from trunk
Authored by: ecarter 2007-09-20
Parent: [r6032]
Child: [r6034]