Testing: Merge through r6040 from trunk
Authored by: ecarter 2007-09-21
Parent: [r6040]
Child: [r6042]