Ticket #2821: Merge 5386,5388-5389,5391-5392 from trunk.
Authored by: ecarter 2007-05-14
Parent: [r5393]
Child: [r5395]