Empty merge(mergeblock) . This was the trunk commit of a change that was originally
accidentally commited to fixes.

--- Merging r21627 into '.':
C packages/fcl-db/tests/testbasics.pas
Summary of conflicts:
Text conflicts: 1

# revisions: 21627
deleted corrected entry 2621268 Invalid stream operation
r21627 | michael | 2012-06-17 09:53:28 +0200 (Sun, 17 Jun 2012) | 1 line
Changed paths:
M /trunk/packages/fcl-db/src/base/dataset.inc
M /trunk/packages/fcl-db/src/base/dsparams.inc
M /trunk/packages/fcl-db/tests/testbasics.pas

* Forgot to apply patch from #21905 in trunk

git-svn-id: branches/fixes_2_6@22704 -