Consensus on the kdelibs coding style

[Maksim Orlovich]

> actually, this is apparently a non-issue now as svn annotate can ignore
> whitespace changes =)

But can svn merge?