Ticket #2821: Merge 5375-5378 from trunk
Authored by: ecarter 2007-05-11
Parent: [r5378]
Child: [r5380]