Testing: Merge up through 5658 from trunk
Authored by: ecarter 2007-06-08
Parent: [r5658]
Child: [r5660]