Merged delphi2010-port branch back into trunk.
Authored by: delphidabbler 2010-02-08
Parent: [r613]
Child: [r615]