Testing: Merge 5697,5703 (up through 5706) from trunk
Authored by: ecarter 2007-06-20
Parent: [r5706]
Child: [r5708]