Ticket #2821: Merge 5366-5367,5369,5371 from trunk
Authored by: ecarter 2007-05-11
Parent: [r5371]
Child: [r5373]