Git commit b82fb845247cdf772e69b36c01bc8e521c247240 by Casper Boemann.
Committed on 30/04/2011 at 23:06.
Pushed by boemann into branch 'textlayout-anchors-boemann'.

Merge branch 'textlayout-anchors-boemann' of git://anongit3.kde.org/calligra into textlayout-anchors-boemann

Conflicts:
	libs/textlayout/KoTextDocumentLayout.cpp

I  +1    -1    libs/textlayout/AnchorStrategy.cpp     
MM +4    -2    libs/textlayout/KoTextDocumentLayout.cpp     

http://commits.kde.org/calligra/b82fb845247cdf772e69b36c01bc8e521c247240