Ticket #2821: Merge [5384] from trunk
Authored by: ecarter 2007-05-11
Parent: [r5384]
Child: [r5386]