Testing: Merge through r5958 from trunk
Authored by: ecarter 2007-08-23
Parent: [r5958]
Child: [r5960]