Testing: Merge through [6591] from trunk
Authored by: ecarter 2008-02-27
Parent: [r6613]
Child: [r6615]