Testing: Merge 5609-5611,5613-5614,5616 from trunk
Authored by: ecarter 2007-06-06
Parent: [r5616]
Child: [r5618]