merge differently headed/dotted on/off
merge differently headed/dotted on/off

svn path=/trunk/KDE/kdelibs/kate/; revision=942941

jfmcarreira/kate,hlamer/kate,sandsmark/kate,hlamer/kate,hlamer/kate,DickJ/kate,cmacq2/kate,DickJ/kate,DickJ/kate,sandsmark/kate,sandsmark/kate,jfmcarreira/kate,hlamer/kate,sandsmark/kate,hlamer/kate,hlamer/kate,cmacq2/kate,hlamer/kate,hlamer/kate,cmacq2/kate,jfmcarreira/kate,hlamer/kate,DickJ/kate,hlamer/kate