Merged trunk changes r432:444 into the delphi2010-port branch.
Authored by: delphidabbler 2009-10-21
Parent: [r445]
Child: [r447]