Merged trunk changes r522-534 into the delphi2010-port branch.
Authored by: delphidabbler 2009-12-28
Parent: [r535]
Child: [r537]