Testing: merge through r6013 from trunk.
Authored by: ecarter 2007-09-20
Parent: [r6033]
Child: [r6035]