Merged trunk changes r589-600 into the delphi2010-port branch.
Authored by: delphidabbler 2010-02-08
Parent: [r601]
Child: [r603]