Merged trunk changes r549-565 into the delphi2010-port branch.
Authored by: delphidabbler 2010-01-10
Parent: [r566]
Child: [r568]