Testing: Merge through r5954 from trunk
Authored by: ecarter 2007-08-22
Parent: [r5955]
Child: [r5957]