Ticket #2821: Merge 5403-5404,5407 from trunk
Authored by: ecarter 2007-05-17
Parent: [r5410]
Child: [r5412]