Merged trunk changes r538-546 into the delphi2010-port branch.
Authored by: delphidabbler 2010-01-01
Parent: [r547]
Child: [r549]