Direct merging caused a conflict.
See attached patch against fixes branch.
Alexander S. Klenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tachart_marginsformarks.patch
Type: application/octet-stream
Size: 2459 bytes
Desc: not available
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20121019/379d4f0a/attachment.obj>