backport SVN commit 835597 by tilladam:

Make sure to actually remove incidences from the by-date multihash by finding them by uid, not pointer, since those are frequently cloned, and thus not reliable.

port SVN commit 835617 by tilladam:

Oops. Tiny mistake during refactoring into a template method. Big consequence.

Thomas, I was told you need to block these in svnmerge.

CCMAIL: Thomas.McGuire@gmx.net

svn path=/branches/KDE/4.1/kdepimlibs/; revision=835640