Testing: Merge 5565,5567-5570,5572 from trunk
Authored by: ecarter 2007-06-04
Parent: [r5574]
Child: [r5576]