--- Merging r32336 into '.':
C tests/Makefile
C tests/Makefile.fpc
--- Recording mergeinfo for merge of r32336 into '.':
U .
Summary of conflicts:
Text conflicts: 2

# revisions: 32336,32357,32358,32722,32723

git-svn-id: branches/fixes_3_0@33812 -