Merged revisions 6773 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

r6773 (florian)
* test fixed

git-svn-id: branches/fixes_2_2@6809 -